[BUGFIX] DBAL: Rename null specific 23/40123/4
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Tue, 9 Jun 2015 09:35:29 +0000 (11:35 +0200)
committerMarkus Klein <markus.klein@typo3.org>
Tue, 9 Jun 2015 14:26:01 +0000 (16:26 +0200)
Rename the null specific for PHP 7 compliance.

Resolves: #67362
Related: #67297
Releases: master
Change-Id: I4fe56c5815f84a7e8db8abd3a4eddded4faf9044
Reviewed-on: http://review.typo3.org/40123
Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de>
Tested-by: Mathias Brodala <mbrodala@pagemachine.de>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
typo3/sysext/dbal/Classes/Database/Specifics/Null.php [deleted file]
typo3/sysext/dbal/Classes/Database/Specifics/NullSpecifics.php [new file with mode: 0644]
typo3/sysext/dbal/Tests/Unit/Database/DatabaseSpecificsTest.php

index fde289e..2f64c7f 100644 (file)
@@ -245,7 +245,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
                                                throw new \InvalidArgumentException($className . ' must inherit from ' . Specifics\AbstractSpecifics::class, 1416919866);
                                        }
                                } else {
-                                       $className = Specifics\Null::class;
+                                       $className = Specifics\NullSpecifics::class;
                                }
                                $this->dbmsSpecifics = GeneralUtility::makeInstance($className);
                        }
diff --git a/typo3/sysext/dbal/Classes/Database/Specifics/Null.php b/typo3/sysext/dbal/Classes/Database/Specifics/Null.php
deleted file mode 100644 (file)
index 88728c7..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-namespace TYPO3\CMS\Dbal\Database\Specifics;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * This class contains a null driver for specifics used by any
- * DBMS that does not have its own requirements.
- * Any logic is in AbstractSpecifics.
- */
-class Null extends AbstractSpecifics {
-}
diff --git a/typo3/sysext/dbal/Classes/Database/Specifics/NullSpecifics.php b/typo3/sysext/dbal/Classes/Database/Specifics/NullSpecifics.php
new file mode 100644 (file)
index 0000000..dab1da4
--- /dev/null
@@ -0,0 +1,23 @@
+<?php
+namespace TYPO3\CMS\Dbal\Database\Specifics;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * This class contains a null driver for specifics used by any
+ * DBMS that does not have its own requirements.
+ * Any logic is in AbstractSpecifics.
+ */
+class NullSpecifics extends AbstractSpecifics {
+}
index dd7bed3..0f07d71 100644 (file)
@@ -34,7 +34,7 @@ class DatabaseSpecificsTest extends AbstractTestCase {
                $GLOBALS['TYPO3_LOADED_EXT'] = array();
 
                /** @var AbstractSpecifics|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $subject */
-               $this->subject = GeneralUtility::makeInstance(\TYPO3\CMS\Dbal\Database\Specifics\Null::class);
+               $this->subject = GeneralUtility::makeInstance(\TYPO3\CMS\Dbal\Database\Specifics\NullSpecifics::class);
        }
 
        /**