[TASK] Change "null" into "NULL"
authorStefano Kowalke <blueduck@gmx.net>
Wed, 27 Apr 2011 09:21:19 +0000 (11:21 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 29 Apr 2011 14:58:15 +0000 (16:58 +0200)
The special value "null" should written in uppercase "NULL".

Change-Id: I84deb049c823ee6b51792df7afd08b18bbff5cac
Resolves: #26345
Releases: 4.6
Reviewed-on: http://review.typo3.org/1791
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
60 files changed:
t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
t3lib/class.t3lib_befunc.php
t3lib/class.t3lib_cs.php
t3lib/class.t3lib_install.php
t3lib/class.t3lib_page.php
t3lib/class.t3lib_registry.php
t3lib/db/class.t3lib_db_preparedstatement.php
t3lib/extjs/dataprovider/class.extdirect_dataprovider_backendlivesearch.php
t3lib/mail/class.t3lib_mail_mboxtransport.php
t3lib/mail/class.t3lib_mail_rfc822addressesparser.php
t3lib/tree/tca/class.t3lib_tree_tca_databasetreedataprovider.php
t3lib/utility/class.t3lib_utility_command.php
tests/t3lib/class.t3lib_csTest.php
tests/t3lib/class.t3lib_divTest.php
tests/t3lib/class.t3lib_iconWorksTest.php
tests/t3lib/db/class.t3lib_db_preparedstatementTest.php
tests/typo3/sysext/cms/tslib/class.tslib_contentTest.php
typo3/classes/class.clearcachemenu.php
typo3/classes/class.livesearch.php
typo3/classes/class.shortcutmenu.php
typo3/classes/class.typo3ajax.php
typo3/classes/class.typo3logo.php
typo3/interfaces/interface.backend_toolbaritem.php
typo3/sysext/cms/classes/class.tx_cms_backendlayout.php
typo3/sysext/cms/tslib/class.tslib_eidtools.php
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/cms/tslib/class.tslib_pibase.php
typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
typo3/sysext/dbal/class.ux_t3lib_db.php
typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectsoap.php
typo3/sysext/em/classes/connection/class.tx_em_connection_soap.php
typo3/sysext/em/classes/index.php
typo3/sysext/felogin/tests/tx_feloginTest.php
typo3/sysext/indexed_search/modfunc2/class.tx_indexedsearch_modfunc2.php
typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
typo3/sysext/opendocs/class.tx_opendocs.php
typo3/sysext/openid/sv1/class.tx_openid_store.php
typo3/sysext/openid/sv1/class.tx_openid_sv1.php
typo3/sysext/perm/mod1/class.sc_mod_web_perm_ajax.php
typo3/sysext/recycler/mod1/index.php
typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php
typo3/sysext/rsaauth/hooks/class.tx_rsaauth_loginformhook.php
typo3/sysext/rsaauth/sv1/backends/class.tx_rsaauth_abstract_backend.php
typo3/sysext/rsaauth/sv1/backends/class.tx_rsaauth_backendfactory.php
typo3/sysext/rsaauth/sv1/backends/class.tx_rsaauth_cmdline_backend.php
typo3/sysext/rsaauth/sv1/backends/class.tx_rsaauth_php_backend.php
typo3/sysext/rsaauth/sv1/class.tx_rsaauth_sv1.php
typo3/sysext/rsaauth/sv1/storage/class.tx_rsaauth_abstract_storage.php
typo3/sysext/rsaauth/sv1/storage/class.tx_rsaauth_session_storage.php
typo3/sysext/rsaauth/sv1/storage/class.tx_rsaauth_split_storage.php
typo3/sysext/rsaauth/sv1/storage/class.tx_rsaauth_storagefactory.php
typo3/sysext/scheduler/class.tx_scheduler.php
typo3/sysext/scheduler/class.tx_scheduler_task.php
typo3/sysext/sys_action/toolbarmenu/class.tx_sysaction_toolbarmenu.php
typo3/sysext/version/ws/class.wslib_gui.php
typo3/sysext/version/ws/publish.php
typo3/sysext/workspaces/Classes/BackendUserInterface/WorkspaceSelectorToolbarItem.php
typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
typo3/sysext/workspaces/Classes/Service/Stages.php
typo3/sysext/workspaces/Classes/Service/Workspaces.php

index 58c17ea..b0cbdce 100644 (file)
@@ -56,7 +56,7 @@ class t3lib_cache_backend_FileBackend extends t3lib_cache_backend_AbstractBacken
         *
         * @var integer
         */
-       protected $maximumPathLength = null;
+       protected $maximumPathLength = NULL;
 
        /**
         * Constructs this backend
index d70a4a3..135211a 100644 (file)
@@ -4435,7 +4435,7 @@ final class t3lib_BEfunc {
                                                                        }
                                                                }
                                                                $memcache_obj = @memcache_connect($host, $port);
-                                                               if ($memcache_obj != null) {
+                                                               if ($memcache_obj != NULL) {
                                                                        memcache_close($memcache_obj);
                                                                } else {
                                                                        $failed[] = $configuredServer;
index 30db400..a66f369 100644 (file)
  *
  *                       SECTION: Init functions
  *  911:        function initCharset($charset)
- *  973:        function initUnicodeData($mode=null)
+ *  973:        function initUnicodeData($mode=NULL)
  * 1198:        function initCaseFolding($charset)
  * 1260:        function initToASCII($charset)
  *
  *                       SECTION: String operation functions
- * 1331:        function substr($charset,$string,$start,$len=null)
+ * 1331:        function substr($charset,$string,$start,$len=NULL)
  * 1384:        function strlen($charset,$string)
  * 1414:        function crop($charset,$string,$len,$crop='')
  * 1467:        function strtrunc($charset,$string,$len)
@@ -65,7 +65,7 @@
  * 1567:        function sb_char_mapping($str,$charset,$mode,$opt='')
  *
  *                       SECTION: Internal UTF-8 string operation functions
- * 1622:        function utf8_substr($str,$start,$len=null)
+ * 1622:        function utf8_substr($str,$start,$len=NULL)
  * 1655:        function utf8_strlen($str)
  * 1676:        function utf8_strtrunc($str,$len)
  * 1698:        function utf8_strpos($haystack,$needle,$offset=0)
@@ -76,7 +76,7 @@
  *
  *                       SECTION: Internal EUC string operation functions
  * 1885:        function euc_strtrunc($str,$len,$charset)
- * 1914:        function euc_substr($str,$start,$charset,$len=null)
+ * 1914:        function euc_substr($str,$start,$charset,$len=NULL)
  * 1939:        function euc_strlen($str,$charset)
  * 1966:        function euc_char2byte_pos($str,$pos,$charset)
  * 2007:        function euc_char_mapping($str,$charset,$mode,$opt='')
index 6d3c8d0..e092459 100644 (file)
@@ -514,7 +514,7 @@ class t3lib_install {
                                                        $parts[1] = str_ireplace(' DEFAULT ', ' default ', $parts[1]);
                                                }
 
-                                                       // Change order of "default" and "null" statements
+                                                       // Change order of "default" and "NULL" statements
                                                $parts[1] = preg_replace('/(.*) (default .*) (NOT NULL)/', '$1 $3 $2', $parts[1]);
                                                $parts[1] = preg_replace('/(.*) (default .*) (NULL)/', '$1 $3 $2', $parts[1]);
 
index 323d583..33c2879 100644 (file)
@@ -974,7 +974,7 @@ class t3lib_pageSelect {
         * @see tslib_TStemplate::start(), storeHash()
         */
        public static function getHash($hash, $expTime = 0) {
-               $hashContent = null;
+               $hashContent = NULL;
 
                if (TYPO3_UseCachingFramework) {
                        if (is_object($GLOBALS['typo3CacheManager'])) {
index 73536c3..b07a8fc 100644 (file)
@@ -55,11 +55,11 @@ class t3lib_Registry implements t3lib_Singleton {
         *
         * @param       string  Extension key for extensions starting with 'tx_' / 'user_' or 'core' for core registry entries
         * @param       string  The key of the entry to return.
-        * @param       mixed   Optional default value to use if this entry has never been set. Defaults to null.
+        * @param       mixed   Optional default value to use if this entry has never been set. Defaults to NULL.
         * @return      mixed   The value of the entry.
         * @throws      InvalidArgumentException        Throws an exception if the given namespace is not valid
         */
-       public function get($namespace, $key, $defaultValue = null) {
+       public function get($namespace, $key, $defaultValue = NULL) {
                if (!isset($this->entries[$namespace])) {
                        $this->loadEntriesByNamespace($namespace);
                }
index 5f3013d..ae3e7ab 100644 (file)
@@ -164,7 +164,7 @@ class t3lib_db_PreparedStatement {
         * $statement->bindValues(array(':nickname' => 'goofy', ':status' => 'FIXED'));
         * </code>
         *
-        * @param array $values The values to bind to the parameter. The PHP type of each array value will be used to decide which PARAM_* type to use (int, string, boolean, null), so make sure your variables are properly casted, if needed.
+        * @param array $values The values to bind to the parameter. The PHP type of each array value will be used to decide which PARAM_* type to use (int, string, boolean, NULL), so make sure your variables are properly casted, if needed.
         * @return t3lib_db_PreparedStatement The current prepared statement to allow method chaining
         * @api
         */
@@ -253,7 +253,7 @@ class t3lib_db_PreparedStatement {
         * $statement->execute(array(':nickname' => 'goofy', ':status' => 'FIXED'));
         * </code>
         *
-        * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. The PHP type of each array value will be used to decide which PARAM_* type to use (int, string, boolean, null), so make sure your variables are properly casted, if needed.
+        * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. The PHP type of each array value will be used to decide which PARAM_* type to use (int, string, boolean, NULL), so make sure your variables are properly casted, if needed.
         * @return boolean Returns TRUE on success or FALSE on failure.
         * @api
         */
index bf45954..a6799f4 100644 (file)
@@ -47,12 +47,12 @@ class extDirect_dataProvider_BackendLiveSearch {
        /**
         * @var t3lib_search_livesearch
         */
-       protected $liveSearch = null;
+       protected $liveSearch = NULL;
 
        /**
         * @var t3lib_search_livesearch_queryParser
         */
-       protected $queryParser = null;
+       protected $queryParser = NULL;
 
        /**
         * Initialize the live search
index 43f29c3..f988a68 100644 (file)
@@ -77,7 +77,7 @@ class t3lib_mail_MboxTransport implements Swift_Transport {
         * @return int
         * @throws Exception
         */
-       public function send(Swift_Mime_Message $message, &$failedRecipients = null) {
+       public function send(Swift_Mime_Message $message, &$failedRecipients = NULL) {
                $message->generateId();
 
                        // Create a mbox-like header
@@ -118,7 +118,7 @@ class t3lib_mail_MboxTransport implements Swift_Transport {
         * Determine the best-use reverse path for this message
         *
         * @param Swift_Mime_Message $message
-        * @return mixed|null
+        * @return mixed|NULL
         */
        private function getReversePath(Swift_Mime_Message $message) {
                $return = $message->getReturnPath();
index 91d50a8..ee4ecc2 100644 (file)
@@ -105,13 +105,13 @@ class t3lib_mail_Rfc822AddressesParser {
         * The current error message, if any.
         * @var string $error
         */
-       private $error = null;
+       private $error = NULL;
 
        /**
         * An internal counter/pointer.
         * @var integer $index
         */
-       private $index = null;
+       private $index = NULL;
 
        /**
         * The number of groups that have been found in the address list.
@@ -124,7 +124,7 @@ class t3lib_mail_Rfc822AddressesParser {
         * A limit after which processing stops
         * @var int $limit
         */
-       private $limit = null;
+       private $limit = NULL;
 
        /**
         * Sets up the object.
@@ -134,7 +134,7 @@ class t3lib_mail_Rfc822AddressesParser {
         * @param string  $default_domain  Default domain/host etc. If not supplied, will be set to localhost.
         * @param boolean $validate             Whether to validate atoms. Turn this off if you need to run addresses through before encoding the personal names, for instance.
         */
-       public function __construct($address = null, $default_domain = null, $validate = null, $limit = null) {
+       public function __construct($address = NULL, $default_domain = NULL, $validate = NULL, $limit = NULL) {
                if (isset($address)) $this->address = $address;
                if (isset($default_domain)) $this->default_domain = $default_domain;
                if (isset($validate)) $this->validate = $validate;
@@ -153,7 +153,7 @@ class t3lib_mail_Rfc822AddressesParser {
         *
         * @return array A structured array of addresses.
         */
-       public function parseAddressList($address = null, $default_domain = null, $validate = null, $limit = null) {
+       public function parseAddressList($address = NULL, $default_domain = NULL, $validate = NULL, $limit = NULL) {
                if (isset($address)) $this->address = $address;
                if (isset($default_domain)) $this->default_domain = $default_domain;
                if (isset($validate)) $this->validate = $validate;
@@ -161,8 +161,8 @@ class t3lib_mail_Rfc822AddressesParser {
 
                $this->structure = array();
                $this->addresses = array();
-               $this->error = null;
-               $this->index = null;
+               $this->error = NULL;
+               $this->index = NULL;
 
                // Unfold any long lines in $this->address.
                $this->address = preg_replace('/\r?\n/', "\r\n", $this->address);
index ed2df19..7786904 100644 (file)
@@ -237,7 +237,7 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
         * Builds a complete node including childs
         *
         * @param t3lib_tree_Node $basicNode
-        * @param null|t3lib_tree_tca_DatabaseNode $parent
+        * @param NULL|t3lib_tree_tca_DatabaseNode $parent
         * @param int $level
         * @return A|object
         */
@@ -312,7 +312,7 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
         *
         * @param t3lib_tree_Node $node
         * @param  $level
-        * @return A|null|object
+        * @return A|NULL|object
         */
        protected function getChildrenOf(t3lib_tree_Node $node, $level) {
                $nodeData = NULL;
index 29b0703..e5cf52a 100644 (file)
@@ -39,9 +39,9 @@ final class t3lib_utility_Command {
         *
         * @static
         * @param  string  $command
-        * @param  null|array $output
+        * @param  NULL|array $output
         * @param  integer $returnValue
-        * @return null|array
+        * @return NULL|array
         */
        public static function exec($command, &$output = NULL, &$returnValue = 0) {
                if (TYPO3_OS == 'WIN' && version_compare(phpversion(), '5.3.0', '<')) {
index 5589219..9a4f35e 100644 (file)
@@ -34,7 +34,7 @@ class t3lib_csTest extends tx_phpunit_testcase {
        /**
         * @var t3lib_cs
         */
-       private $fixture = null;
+       private $fixture = NULL;
 
        public function setUp() {
                $this->fixture = new t3lib_cs();
index 0ed35cc..206ced3 100644 (file)
@@ -215,11 +215,11 @@ class t3lib_divTest extends tx_phpunit_testcase {
         */
        public static function invalidIpDataProvider() {
                return array(
-                       'null' => array(null),
+                       'null' => array(NULL),
                        'zero' => array(0),
                        'string' => array('test'),
                        'string empty' => array(''),
-                       'string null' => array('null'),
+                       'string NULL' => array('NULL'),
                        'out of bounds IPv4' => array('300.300.300.300'),
                        'dotted decimal notation with only two dots' => array('127.0.1'),
                );
@@ -339,17 +339,17 @@ class t3lib_divTest extends tx_phpunit_testcase {
                        'no case sensitive string match' => array('hello world', 'Hello'),
                        'array is not part of string' => array('string', array()),
                        'string is not part of array' => array(array(), 'string'),
-                       'null is not part of string' => array('string', NULL),
+                       'NULL is not part of string' => array('string', NULL),
                        'string is not part of array' => array(NULL, 'string'),
-                       'null is not part of array' => array(array(), NULL),
+                       'NULL is not part of array' => array(array(), NULL),
                        'array is not part of string' => array(NULL, array()),
                        'empty string is not part of empty string' => array('', ''),
-                       'null is not part of empty string' => array('', NULL),
+                       'NULL is not part of empty string' => array('', NULL),
                        'false is not part of empty string' => array('', FALSE),
-                       'empty string is not part of null' => array(NULL, ''),
+                       'empty string is not part of NULL' => array(NULL, ''),
                        'empty string is not part of false' => array(FALSE, ''),
                        'empty string is not part of zero integer' => array(0, ''),
-                       'zero integer is not part of null' => array(NULL, 0),
+                       'zero integer is not part of NULL' => array(NULL, 0),
                        'zero integer is not part of empty string' => array('', 0),
                );
        }
@@ -2668,7 +2668,7 @@ class t3lib_divTest extends tx_phpunit_testcase {
        }
 
        /**
-        * Tests whether verifyFilenameAgainstDenyPattern detects the null character.
+        * Tests whether verifyFilenameAgainstDenyPattern detects the NULL character.
         *
         * @test
         */
index 5fa6720..199d9e5 100644 (file)
@@ -278,7 +278,7 @@ class t3lib_iconWorksTest extends tx_phpunit_testcase {
        //////////////////////////////////////////
 
        /**
-        * Tests the returns of null table + empty array
+        * Tests the returns of NULL table + empty array
         * @test
         */
        public function getSpriteIconForRecordWithNullTableReturnsMissingIcon() {
index e5ac1cf..dda26ce 100644 (file)
@@ -197,10 +197,10 @@ class t3lib_db_PreparedStatementTest extends tx_phpunit_testcase {
                        'integer passed with param type NULL' => array(1, t3lib_db_PreparedStatement::PARAM_NULL),
                        'string passed with param type NULL' => array('1', t3lib_db_PreparedStatement::PARAM_NULL),
                        'bool passed with param type NULL' => array(TRUE, t3lib_db_PreparedStatement::PARAM_NULL),
-                       'null passed with param type INT' => array(NULL, t3lib_db_PreparedStatement::PARAM_INT),
+                       'NULL passed with param type INT' => array(NULL, t3lib_db_PreparedStatement::PARAM_INT),
                        'string passed with param type INT' => array('1', t3lib_db_PreparedStatement::PARAM_INT),
                        'bool passed with param type INT' => array(TRUE, t3lib_db_PreparedStatement::PARAM_INT),
-                       'null passed with param type BOOL' => array(NULL, t3lib_db_PreparedStatement::PARAM_BOOL),
+                       'NULL passed with param type BOOL' => array(NULL, t3lib_db_PreparedStatement::PARAM_BOOL),
                        'string passed with param type BOOL' => array('1', t3lib_db_PreparedStatement::PARAM_BOOL),
                        'integer passed with param type BOOL' => array(1, t3lib_db_PreparedStatement::PARAM_BOOL),
                );
index 86a7e52..795ea02 100644 (file)
@@ -97,7 +97,7 @@ class tslib_contentTest extends tx_phpunit_testcase {
                        $GLOBALS[$key] = $data;
                }
 
-               $GLOBALS['TSFE'] = null;
+               $GLOBALS['TSFE'] = NULL;
 
                unset($this->cObj, $this->tsfe, $this->template, $this->typoScriptImage);
        }
index b28b00b..96b135a 100644 (file)
@@ -50,7 +50,7 @@ class ClearCacheMenu implements backend_toolbarItem {
         *
         * @param       TYPO3backend    TYPO3 backend object reference
         */
-       public function __construct(TYPO3backend &$backendReference = null) {
+       public function __construct(TYPO3backend &$backendReference = NULL) {
                $this->backendReference = $backendReference;
                $this->cacheActions     = array();
                $this->optionValues     = array('all', 'pages');
index e4ccf76..6c93a5e 100644 (file)
@@ -48,7 +48,7 @@ class LiveSearch implements backend_toolbarItem {
         *
         * @param       TYPO3backend    TYPO3 backend object reference
         */
-       public function __construct(TYPO3backend &$backendReference = null) {
+       public function __construct(TYPO3backend &$backendReference = NULL) {
                $this->backendReference = $backendReference;
        }
 
index 9933ee1..e948d25 100644 (file)
@@ -74,7 +74,7 @@ class ShortcutMenu implements backend_toolbarItem {
         * @param       TYPO3backend    TYPO3 backend object reference
         * @return      void
         */
-       public function __construct(TYPO3backend &$backendReference = null) {
+       public function __construct(TYPO3backend &$backendReference = NULL) {
                $this->backendReference = $backendReference;
                $this->shortcuts        = array();
 
@@ -222,7 +222,7 @@ class ShortcutMenu implements backend_toolbarItem {
         * @param       TYPO3AJAX       object of type TYPO3AJAX
         * @return      void
         */
-       public function renderAjax($params = array(), TYPO3AJAX &$ajaxObj = null) {
+       public function renderAjax($params = array(), TYPO3AJAX &$ajaxObj = NULL) {
                $menuContent = $this->renderMenu();
 
                $ajaxObj->addContent('shortcutMenu', $menuContent);
@@ -384,7 +384,7 @@ class ShortcutMenu implements backend_toolbarItem {
         * @param       TYPO3AJAX       object of type TYPO3AJAX
         * @return      array
         */
-       protected function initShortcutGroups($params = array(), TYPO3AJAX &$ajaxObj = null) {
+       protected function initShortcutGroups($params = array(), TYPO3AJAX &$ajaxObj = NULL) {
                        // groups from TSConfig
                        // "Shortcuts" have been renamed to "Bookmarks"
                        // @deprecated remove shortcuts code in TYPO3 4.7
@@ -457,7 +457,7 @@ class ShortcutMenu implements backend_toolbarItem {
         * @param       TYPO3AJAX       object of type TYPO3AJAX
         * @return      void
         */
-       public function getAjaxShortcutGroups($params = array(), TYPO3AJAX &$ajaxObj = null) {
+       public function getAjaxShortcutGroups($params = array(), TYPO3AJAX &$ajaxObj = NULL) {
                $shortcutGroups = $this->shortcutGroups;
 
                if(!$GLOBALS['BE_USER']->isAdmin()) {
@@ -479,7 +479,7 @@ class ShortcutMenu implements backend_toolbarItem {
         * @param       TYPO3AJAX       object of type TYPO3AJAX
         * @return      void
         */
-       public function deleteAjaxShortcut($params = array(), TYPO3AJAX &$ajaxObj = null) {
+       public function deleteAjaxShortcut($params = array(), TYPO3AJAX &$ajaxObj = NULL) {
                $shortcutId   = (int) t3lib_div::_POST('shortcutId');
                $fullShortcut = $this->getShortcutById($shortcutId);
                $ajaxReturn   = 'failed';
@@ -505,7 +505,7 @@ class ShortcutMenu implements backend_toolbarItem {
         * @param       TYPO3AJAX       object of type TYPO3AJAX
         * @return      void
         */
-       public function createAjaxShortcut($params = array(), TYPO3AJAX &$ajaxObj = null) {
+       public function createAjaxShortcut($params = array(), TYPO3AJAX &$ajaxObj = NULL) {
                global $LANG;
 
                $shortcutCreated     = 'failed';
@@ -588,7 +588,7 @@ class ShortcutMenu implements backend_toolbarItem {
         * @param       TYPO3AJAX       object of type TYPO3AJAX
         * @return      void
         */
-       public function setAjaxShortcut($params = array(), TYPO3AJAX &$ajaxObj = null) {
+       public function setAjaxShortcut($params = array(), TYPO3AJAX &$ajaxObj = NULL) {
 
                $shortcutId      = (int) t3lib_div::_POST('shortcutId');
                $shortcutName    = strip_tags(t3lib_div::_POST('value'));
index 328e6c1..6655836 100644 (file)
@@ -34,8 +34,8 @@
  * @subpackage core
  */
 class TYPO3AJAX {
-       protected $ajaxId        = null;
-       protected $errorMessage  = null;
+       protected $ajaxId        = NULL;
+       protected $errorMessage  = NULL;
        protected $isError       = false;
        protected $content       = array();
        protected $contentFormat = 'plain';
index 1d10e54..054b09a 100644 (file)
@@ -43,7 +43,7 @@ class TYPO3Logo {
         * @return void
         */
        public function __construct() {
-               $this->logo = null;
+               $this->logo = NULL;
        }
 
        /**
index 024965b..74d17df 100644 (file)
@@ -40,7 +40,7 @@ interface backend_toolbarItem {
         *
         * @param       TYPO3backend    TYPO3 backend object reference
         */
-       public function __construct(TYPO3backend &$backendReference = null);
+       public function __construct(TYPO3backend &$backendReference = NULL);
 
        /**
         * checks whether the user has access to this toolbar item
index 36285e2..7d26fae 100644 (file)
@@ -98,7 +98,7 @@ class tx_cms_BackendLayout {
         * Gets the selected backend layout
         *
         * @param  int  $id
-        * @return array|null  $backendLayout
+        * @return array|NULL  $backendLayout
         */
        public function getSelectedBackendLayout($id) {
                $rootline = t3lib_BEfunc::BEgetRootLine($id);
index 518c697..539fe7a 100644 (file)
@@ -158,7 +158,7 @@ final class tslib_eidtools {
         */
        private static function getTSFE() {
                // Cached instance
-               static $tsfe = null;
+               static $tsfe = NULL;
 
                if (is_null($tsfe)) {
                        $tsfe = t3lib_div::makeInstance('tslib_fe', $GLOBALS['TYPO3_CONF_VARS'], 0, 0);
index da12690..315efa0 100644 (file)
        var $rootLine='';                                       // The rootLine (all the way to tree root, not only the current site!) (array)
        var $page='';                                           // The pagerecord (array)
        var $contentPid=0;                                      // This will normally point to the same value as id, but can be changed to point to another page from which content will then be displayed instead.
-       protected $originalShortcutPage = null; // gets set when we are processing a page of type shortcut in the early stages opf init.php when we do not know about languages yet, used later in init.php to determine the correct shortcut in case a translation changes the shortcut target (array)
+       protected $originalShortcutPage = NULL; // gets set when we are processing a page of type shortcut in the early stages opf init.php when we do not know about languages yet, used later in init.php to determine the correct shortcut in case a translation changes the shortcut target (array)
 
        /**
         * sys_page-object, pagefunctions
                if (is_object($lockObj) && $lockObj instanceof t3lib_lock && $lockObj->getLockStatus()) {
                        $success = $lockObj->release();
                        $lockObj->sysLog('Released lock');
-                       $lockObj = null;
+                       $lockObj = NULL;
                        // Otherwise, if caching is disabled, no locking is required:
                } elseif ($this->no_cache || $this->headerNoCache()) {
                        $success = TRUE;
index 07f45a2..152dd1e 100644 (file)
@@ -523,7 +523,7 @@ class tslib_pibase {
                                // Make browse-table/links:
                        if ($showFirstLast) { // Link to first page
                                if ($pointer>0) {
-                                       $links[]=$this->cObj->wrap($this->pi_linkTP_keepPIvars($this->pi_getLL('pi_list_browseresults_first','<< First',$hscText),array($pointerName => null),$pi_isOnlyFields),$wrapper['inactiveLinkWrap']);
+                                       $links[]=$this->cObj->wrap($this->pi_linkTP_keepPIvars($this->pi_getLL('pi_list_browseresults_first','<< First',$hscText),array($pointerName => NULL),$pi_isOnlyFields),$wrapper['inactiveLinkWrap']);
                                } else {
                                        $links[]=$this->cObj->wrap($this->pi_getLL('pi_list_browseresults_first','<< First',$hscText),$wrapper['disabledLinkWrap']);
                                }
index e8fc298..952aea1 100755 (executable)
@@ -1020,7 +1020,7 @@ class tx_cssstyledcontent_pi1 extends tslib_pibase {
         * Returns an object reference to the hook object if any
         *
         * @param       string          Name of the function you want to call / hook key
-        * @return      object          Hook object, if any. Otherwise null.
+        * @return      object          Hook object, if any. Otherwise NULL.
         */
        function hookRequest($functionName) {
                global $TYPO3_CONF_VARS;
index f99b173..faedcf6 100644 (file)
@@ -1964,7 +1964,7 @@ class ux_t3lib_DB extends t3lib_DB {
                                if ($this->handlerInstance[$this->lastHandlerKey]['link']) {
                                        $str = mysql_real_escape_string($str, $this->handlerInstance[$this->lastHandlerKey]['link']);
                                } else {
-                                       // link may be null when unit testing DBAL
+                                       // link may be NULL when unit testing DBAL
                                        $str = str_replace('\'', '\\\'', $str);
                                }
                                break;
@@ -2452,7 +2452,7 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      string          Returns the type of the specified field index
         */
        public function sql_field_type(&$res, $pointer) {
-               if ($res === null) {
+               if ($res === NULL) {
                        debug(array('no res in sql_field_type!'));
                        return 'text';
                }
index c318700..df1e275 100644 (file)
@@ -323,7 +323,7 @@ class tx_em_Connection_ExtDirectSoap {
        }
        /**
         * @param  $data
-        * @return bool|null|string|tx_em_Settings|unknown
+        * @return bool|NULL|string|tx_em_Settings|unknown
         */
        protected function addUploads($data) {
                if (count((array) $data) === 0) {
index ca38ecf..4cb9f55 100644 (file)
@@ -174,7 +174,7 @@ class tx_em_Connection_Soap {
         * @return      unknown
         */
        function callPhpSOAP($func, $param) {
-               $header = null;
+               $header = NULL;
                if ($this->options['authentication'] == 'headers') {
                        if ($this->reactid) {
                                $header = new SoapHeader(
index aca0fd8..f96034a 100644 (file)
@@ -1220,7 +1220,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase {
         * @return      [type]          ...
         * @todo Make the method able to handle needed interaction somehow (unmatched dependencies)
         */
-       function installExtension($extKey, $version = null, $mode = EM_INSTALL_VERSION_MIN) {
+       function installExtension($extKey, $version = NULL, $mode = EM_INSTALL_VERSION_MIN) {
                list($inst_list,) = $this->extensionList->getInstalledExtensions();
 
                // check if it is already installed and loaded with sufficient version
@@ -1228,7 +1228,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase {
                        $currentVersion = $inst_list[$extKey]['EM_CONF']['version'];
 
                        if (t3lib_extMgm::isLoaded($extKey)) {
-                               if ($version===null) {
+                               if ($version===NULL) {
                                        return array(TRUE, $GLOBALS['LANG']->getLL('ext_import_ext_already_installed_loaded'));
                                } else {
                                        switch ($mode) {
@@ -1310,7 +1310,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase {
                                                // Loop until a version is found
                                        }
 
-                                       if ($v !== null && version_compare($v, $version, '<=')) {
+                                       if ($v !== NULL && version_compare($v, $version, '<=')) {
                                                $version = $v;
                                        } else {
                                                return array(false, $GLOBALS['LANG']->getLL('ext_import_ext_n_a'));
index d93a9ad..f3feb12 100644 (file)
@@ -130,13 +130,13 @@ class tx_feloginTest extends tx_phpunit_testcase {
        }
 
        public function tearDown() {
-               $this->txFelogin = null;
+               $this->txFelogin = NULL;
 
                foreach ($this->backupGlobalVariables as $key => $data) {
                        $GLOBALS[$key] = $data;
                }
 
-               $this->backupGlobalVariables = null;
+               $this->backupGlobalVariables = NULL;
 
        }
 
index fc5059e..063884c 100644 (file)
@@ -196,7 +196,7 @@ class tx_indexedsearch_modfunc2 extends t3lib_extobjbase {
         * Returns an object reference to the hook object if any
         *
         * @param       string          Name of the function you want to call / hook key
-        * @return      object          Hook object, if any. Otherwise null.
+        * @return      object          Hook object, if any. Otherwise NULL.
         * @author Kasper Skårhøj
         */
        function hookRequest($functionName) {
index 01f78db..89f1138 100755 (executable)
@@ -2376,7 +2376,7 @@ class tx_indexedsearch extends tslib_pibase {
         * Returns an object reference to the hook object if any
         *
         * @param       string          Name of the function you want to call / hook key
-        * @return      object          Hook object, if any. Otherwise null.
+        * @return      object          Hook object, if any. Otherwise NULL.
         */
        function hookRequest($functionName) {
                global $TYPO3_CONF_VARS;
index b489f45..8ae6e24 100644 (file)
@@ -58,7 +58,7 @@ class tx_opendocs implements backend_toolbarItem {
         *
         * @param       TYPO3backend    TYPO3 backend object reference
         */
-       public function __construct(TYPO3backend &$backendReference = null) {
+       public function __construct(TYPO3backend &$backendReference = NULL) {
                $this->backendReference = $backendReference;
                $this->loadDocsFromUserSession();
        }
@@ -255,7 +255,7 @@ class tx_opendocs implements backend_toolbarItem {
         * @param       TYPO3AJAX       object of type TYPO3AJAX
         * @return      string          list item HTML attibutes
         */
-       public function closeDocument($params = array(), TYPO3AJAX &$ajaxObj = null) {
+       public function closeDocument($params = array(), TYPO3AJAX &$ajaxObj = NULL) {
                $md5sum = t3lib_div::_GP('md5sum');
 
                if ($md5sum && isset($this->openDocs[$md5sum])) {
@@ -288,7 +288,7 @@ class tx_opendocs implements backend_toolbarItem {
         * @param       TYPO3AJAX       object of type TYPO3AJAX
         * @return      void
         */
-       public function renderAjax($params = array(), TYPO3AJAX &$ajaxObj = null) {
+       public function renderAjax($params = array(), TYPO3AJAX &$ajaxObj = NULL) {
                $menuContent = $this->renderMenu();
 
                $ajaxObj->addContent('opendocsMenu', $menuContent);
index 7e596c2..ce543c2 100644 (file)
@@ -81,13 +81,13 @@ class tx_openid_store extends Auth_OpenID_OpenIDStore {
         * @param string $handle Association handle (optional)
         * @return Auth_OpenID_Association
         */
-       public function getAssociation($serverUrl, $handle = null) {
+       public function getAssociation($serverUrl, $handle = NULL) {
                $this->cleanupAssociations();
 
                $where = sprintf('server_url=%s AND expires>%d',
                        $GLOBALS['TYPO3_DB']->fullQuoteStr($serverUrl, self::ASSOCIATION_TABLE_NAME),
                        time());
-               if ($handle != null) {
+               if ($handle != NULL) {
                        $where .= sprintf(' AND assoc_handle=%s',
                                $GLOBALS['TYPO3_DB']->fullQuoteStr($handle, self::ASSOCIATION_TABLE_NAME));
                        $sort = '';
@@ -103,11 +103,11 @@ class tx_openid_store extends Auth_OpenID_OpenIDStore {
                        $sort
                );
 
-               $result = null;
+               $result = NULL;
                if (is_array($row)) {
                        $result = @unserialize(base64_decode($row['content']));
                        if ($result === false) {
-                               $result = null;
+                               $result = NULL;
                        }
                        else {
                                $this->updateAssociationTimeStamp($row['tstamp']);
index d57038c..22796bd 100644 (file)
@@ -78,7 +78,7 @@ class tx_openid_sv1 extends t3lib_svbase {
         *
         * @var Auth_OpenID_ConsumerResponse
         */
-       protected $openIDResponse = null;
+       protected $openIDResponse = NULL;
 
        /**
         * A reference to the calling object
@@ -144,7 +144,7 @@ class tx_openid_sv1 extends t3lib_svbase {
                $this->loginData = $loginData;
                $this->authenticationInformation = $authenticationInformation;
                // If we are here after authentication by the OpenID server, get its response.
-               if (t3lib_div::_GP('tx_openid_mode') == 'finish' && $this->openIDResponse == null) {
+               if (t3lib_div::_GP('tx_openid_mode') == 'finish' && $this->openIDResponse == NULL) {
                        $this->includePHPOpenIDLibrary();
                        $openIDConsumer = $this->getOpenIDConsumer();
                        $this->openIDResponse = $openIDConsumer->complete($this->getReturnURL());
@@ -161,7 +161,7 @@ class tx_openid_sv1 extends t3lib_svbase {
         * @return      mixed           User record (content of fe_users/be_users as appropriate for the current mode)
         */
        public function getUser() {
-               $userRecord = null;
+               $userRecord = NULL;
                if ($this->loginData['status'] == 'login') {
                        if ($this->openIDResponse instanceof Auth_OpenID_ConsumerResponse) {
                                $GLOBALS['BACK_PATH'] = $this->getBackPath();
@@ -174,7 +174,7 @@ class tx_openid_sv1 extends t3lib_svbase {
                                        $openIDIdentifier = $this->getFinalOpenIDIdentifier();
                                        if ($openIDIdentifier) {
                                                $userRecord = $this->getUserRecord($openIDIdentifier);
-                                               if ($userRecord != null) {
+                                               if ($userRecord != NULL) {
                                                        $this->writeLog('User \'%s\' logged in with OpenID \'%s\'',
                                                                $userRecord[$this->parentObject->formfield_uname], $openIDIdentifier);
                                                } else {
@@ -269,12 +269,12 @@ class tx_openid_sv1 extends t3lib_svbase {
                        if (!defined('Auth_OpenID_RAND_SOURCE')) {
                                if (TYPO3_OS == 'WIN') {
                                        // No random generator on Windows!
-                                       define('Auth_OpenID_RAND_SOURCE', null);
+                                       define('Auth_OpenID_RAND_SOURCE', NULL);
                                } elseif (!is_readable('/dev/urandom')) {
                                        if (is_readable('/dev/random')) {
                                                define('Auth_OpenID_RAND_SOURCE', '/dev/random');
                                        } else {
-                                               define('Auth_OpenID_RAND_SOURCE', null);
+                                               define('Auth_OpenID_RAND_SOURCE', NULL);
                                        }
                                }
                        }
@@ -301,7 +301,7 @@ class tx_openid_sv1 extends t3lib_svbase {
         * @return      array           Database fields from the table that corresponds to the current login mode (FE/BE)
         */
        protected function getUserRecord($openIDIdentifier) {
-               $record = null;
+               $record = NULL;
                if ($openIDIdentifier) {
                        $record = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*',
                                $this->authenticationInformation['db_user']['table'],
index b59f683..2f7c76b 100644 (file)
@@ -32,7 +32,7 @@
  *   97:     public function __construct()
  *
  *              SECTION: Main dispatcher method
- *  143:     public function dispatch($params = array(), TYPO3AJAX &$ajaxObj = null)
+ *  143:     public function dispatch($params = array(), TYPO3AJAX &$ajaxObj = NULL)
  *
  *              SECTION: Helpers for this script
  *  259:     private function renderUserSelector($page, $ownerUid, $username = '')
@@ -126,7 +126,7 @@ class SC_mod_web_perm_ajax {
         * @param       TYPO3AJAX               $ajaxObj: object of type TYPO3AJAX
         * @return      Void
         */
-       public function dispatch($params = array(), TYPO3AJAX &$ajaxObj = null) {
+       public function dispatch($params = array(), TYPO3AJAX &$ajaxObj = NULL) {
                $content = '';
 
                        // Basic test for required value
index 6f01f64..f23c360 100644 (file)
@@ -121,8 +121,8 @@ class  tx_recycler_module1 extends t3lib_SCbase {
                        $content
                );
 
-               $this->content = null;
-               $this->doc = null;
+               $this->content = NULL;
+               $this->doc = NULL;
 
                echo $content;
        }
index 96afb39..8ed4a3a 100644 (file)
@@ -188,7 +188,7 @@ class tx_reports_reports_status_ConfigurationStatus implements tx_reports_Status
                                        }
                                }
                                $memcachedConnection = @memcache_connect($host, $port);
-                               if ($memcachedConnection != null) {
+                               if ($memcachedConnection != NULL) {
                                        memcache_close($memcachedConnection);
                                } else {
                                        $failedConnections[] = $configuredServer;
index 10a4bed..2f4da67 100644 (file)
@@ -45,7 +45,7 @@ class tx_rsaauth_loginformhook {
         * @return      string  Form tag
         */
        public function getLoginFormTag(array $params, SC_index& $pObj) {
-               $form = null;
+               $form = NULL;
                if ($pObj->loginSecurityLevel == 'rsa') {
 
                        // If we can get the backend, we can proceed
index 8d826bd..283d3e7 100644 (file)
@@ -43,7 +43,7 @@ require_once(t3lib_extMgm::extPath('rsaauth', 'sv1/backends/class.tx_rsaauth_key
  *
  * To decode data, the decrypt() method should be called with the private key
  * created at the previous step and the data to decode. If the data is decoded
- * successfully, the result is a string. Otherwise it is null.
+ * successfully, the result is a string. Otherwise it is NULL.
  *
  * @author     Dmitry Dulepov <dmitry@typo3.org>
  * @package    TYPO3
@@ -62,7 +62,7 @@ abstract class tx_rsaauth_abstract_backend {
        /**
         * Creates a new key pair for the encryption.
         *
-        * @return      tx_rsaauth_keypair      A new key pair or null in case of error
+        * @return      tx_rsaauth_keypair      A new key pair or NULL in case of error
         */
        abstract public function createNewKeyPair();
 
@@ -71,7 +71,7 @@ abstract class tx_rsaauth_abstract_backend {
         *
         * @param       string  $privateKey     The private key (obtained from a call to createNewKeyPair())
         * @param       string  $data   Data to decrypt (base64-encoded)
-        * @return      string  Decrypted data or null in case of a error
+        * @return      string  Decrypted data or NULL in case of a error
         */
        abstract public function decrypt($privateKey, $data);
 
index 1d7c686..b75f501 100644 (file)
@@ -66,7 +66,7 @@ class tx_rsaauth_backendfactory {
         *
         * @var tx_rsaauth_abstract_backend
         */
-       static protected $selectedBackend = null;
+       static protected $selectedBackend = NULL;
 
        /**
         * Obtains a backend. This function will return a non-abstract class, which
index e605d27..9c2f890 100644 (file)
@@ -77,11 +77,11 @@ class tx_rsaauth_cmdline_backend extends tx_rsaauth_abstract_backend {
 
        /**
         *
-        * @return tx_rsaauth_keypair   A new key pair or null in case of error
+        * @return tx_rsaauth_keypair   A new key pair or NULL in case of error
         * @see tx_rsaauth_abstract_backend::createNewKeyPair()
         */
        public function createNewKeyPair() {
-               $result = null;
+               $result = NULL;
 
                // Create a temporary file. Security: tempnam() sets permissions to 0600
                $privateKeyFile = tempnam($this->temporaryDirectory, uniqid());
@@ -123,7 +123,7 @@ class tx_rsaauth_cmdline_backend extends tx_rsaauth_abstract_backend {
         *
         * @param string        $privateKey     The private key (obtained from a call to createNewKeyPair())
         * @param string        $data   Data to decrypt (base64-encoded)
-        * @return string       Decrypted data or null in case of a error
+        * @return string       Decrypted data or NULL in case of a error
         * @see tx_rsaauth_abstract_backend::decrypt()
         */
        public function decrypt($privateKey, $data) {
index 49a5792..e45d132 100644 (file)
@@ -42,11 +42,11 @@ class tx_rsaauth_php_backend extends tx_rsaauth_abstract_backend {
        /**
         * Creates a new public/private key pair using PHP OpenSSL extension.
         *
-        * @return tx_rsaauth_keypair   A new key pair or null in case of error
+        * @return tx_rsaauth_keypair   A new key pair or NULL in case of error
         * @see tx_rsaauth_abstract_backend::createNewKeyPair()
         */
        public function createNewKeyPair() {
-               $result = null;
+               $result = NULL;
                $privateKey = @openssl_pkey_new();
                if ($privateKey) {
                        // Create private key as string
@@ -81,13 +81,13 @@ class tx_rsaauth_php_backend extends tx_rsaauth_abstract_backend {
         *
         * @param string        $privateKey     The private key (obtained from a call to createNewKeyPair())
         * @param string        $data   Data to decrypt (base64-encoded)
-        * @return string       Decrypted data or null in case of a error
+        * @return string       Decrypted data or NULL in case of a error
         * @see tx_rsaauth_abstract_backend::decrypt()
         */
        public function decrypt($privateKey, $data) {
                $result = '';
                if (!@openssl_private_decrypt(base64_decode($data), $result, $privateKey)) {
-                       $result = null;
+                       $result = NULL;
                }
                return $result;
        }
index 4047aa4..43b150c 100644 (file)
@@ -49,7 +49,7 @@ class tx_rsaauth_sv1 extends tx_sv_auth  {
         *
         * @var tx_rsaauth_abstract_backend
         */
-       protected       $backend = null;
+       protected       $backend = NULL;
 
        /**
         * Standard extension key for the service
@@ -94,13 +94,13 @@ class tx_rsaauth_sv1 extends tx_sv_auth  {
                        // Preprocess the password
                        $password = $this->login['uident'];
                        $key = $storage->get();
-                       if ($key != null && substr($password, 0, 4) == 'rsa:') {
+                       if ($key != NULL && substr($password, 0, 4) == 'rsa:') {
                                // Decode password and pass to parent
                                $decryptedPassword = $this->backend->decrypt($key, substr($password, 4));
-                               if ($decryptedPassword != null) {
+                               if ($decryptedPassword != NULL) {
                                        // Run the password through the eval function
                                        $decryptedPassword = $this->runPasswordEvaluations($decryptedPassword);
-                                       if ($decryptedPassword != null) {
+                                       if ($decryptedPassword != NULL) {
                                                $this->login['uident'] = $decryptedPassword;
                                                if (parent::authUser($userRecord)) {
                                                        $result = 200;
@@ -110,7 +110,7 @@ class tx_rsaauth_sv1 extends tx_sv_auth  {
                                // Reset the password to its original value
                                $this->login['uident'] = $password;
                                // Remove the key
-                               $storage->put(null);
+                               $storage->put(NULL);
                        }
                }
                return $result;
@@ -155,7 +155,7 @@ class tx_rsaauth_sv1 extends tx_sv_auth  {
                $conf = &$GLOBALS['TCA'][$table]['columns'][$this->pObj->userident_column]['config'];
                $evaluations = $conf['eval'];
                if ($evaluations) {
-                       $tce = null;
+                       $tce = NULL;
                        foreach (t3lib_div::trimExplode(',', $evaluations, TRUE) as $evaluation) {
                                switch ($evaluation) {
                                        case 'md5':
@@ -181,14 +181,14 @@ class tx_rsaauth_sv1 extends tx_sv_auth  {
                                                // We must run these evaluations through TCEmain to avoid
                                                // code duplication and ensure that any custom evaluations
                                                // are called in a proper context
-                                               if ($tce == null) {
+                                               if ($tce == NULL) {
                                                        /* @var $tce t3lib_TCEmain */
                                                        $tce = t3lib_div::makeInstance('t3lib_TCEmain');
                                                }
                                                $result = $tce->checkValue_input_Eval($password, array($evaluation), $conf['is_in']);
                                                if (!isset($result['value'])) {
                                                        // Failure!!!
-                                                       return null;
+                                                       return NULL;
                                                }
                                                $password = $result['value'];
                                }
index 91fa4ba..1e52a65 100644 (file)
@@ -39,7 +39,7 @@ abstract class tx_rsaauth_abstract_storage {
        /**
         * Retrieves the key from the storage
         *
-        * @return      string  The key or null
+        * @return      string  The key or NULL
         */
        abstract public function get();
 
index 2d88aae..625ecd0 100644 (file)
@@ -56,11 +56,11 @@ class tx_rsaauth_session_storage extends tx_rsaauth_abstract_storage {
        /**
         * Obtains key from the session
         *
-        * @return string       The key or null
+        * @return string       The key or NULL
         * @see tx_rsaauth_abstract_storage::get()
         */
        public function get() {
-               return (isset($_SESSION['tx_rsaauth_key']) ? $_SESSION['tx_rsaauth_key'] : null);
+               return (isset($_SESSION['tx_rsaauth_key']) ? $_SESSION['tx_rsaauth_key'] : NULL);
        }
 
        /**
index 9fe914b..d8074c5 100644 (file)
@@ -53,11 +53,11 @@ class tx_rsaauth_split_storage extends tx_rsaauth_abstract_storage {
        /**
         * Obtains a key from the database
         *
-        * @return string       The key or null
+        * @return string       The key or NULL
         * @see tx_rsaauth_abstract_storage::get()
         */
        public function get() {
-               $result = null;
+               $result = NULL;
 
                list($keyId, $keyPart1) = $_SESSION['tx_rsaauth_key'];
                if (t3lib_div::testInt($keyId)) {
@@ -84,7 +84,7 @@ class tx_rsaauth_split_storage extends tx_rsaauth_abstract_storage {
         * @see tx_rsaauth_abstract_storage::put()
         */
        public function put($key) {
-               if ($key == null) {
+               if ($key == NULL) {
                        // Remove existing key
                        list($keyId) = $_SESSION['tx_rsaauth_key'];
 
index 6f51eda..2eee614 100644 (file)
@@ -55,7 +55,7 @@ class tx_rsaauth_storagefactory {
         *
         * @var tx_rsaauth_abstract_storage
         */
-       static protected $storageInstance = null;
+       static protected $storageInstance = NULL;
 
        /**
         * Obtains a storage. This function will return a non-abstract class, which
index 974f523..7e0903a 100755 (executable)
@@ -168,7 +168,7 @@ class tx_scheduler implements t3lib_Singleton {
                                // Register execution
                        $executionID = $task->markExecution();
 
-                       $failure = null;
+                       $failure = NULL;
                        try {
                                        // Execute task
                                $successfullyExecuted = $task->execute();
index 619d492..f1a3161 100755 (executable)
@@ -347,7 +347,7 @@ abstract class tx_scheduler_Task {
         * @param       Exception       An exception to signal a failed execution
         * @return      void
         */
-       public function unmarkExecution($executionID, Exception $failure = null) {
+       public function unmarkExecution($executionID, Exception $failure = NULL) {
                        // Get the executions for the task
                $queryArr = array(
                        'SELECT' => 'serialized_executions',
index 5ad98ae..5fc38b0 100644 (file)
@@ -50,7 +50,7 @@ class tx_sysactionToolbarMenu implements backend_toolbarItem {
         *
         * @return      void
         */
-       public function __construct(TYPO3backend &$backendReference = null) {
+       public function __construct(TYPO3backend &$backendReference = NULL) {
                $this->backendReference = $backendReference;
        }
 
index c27fdcd..0477445 100644 (file)
@@ -40,7 +40,7 @@
  *   84: class wslib_gui
  *
  *              SECTION: Public functions
- *  128:     function getWorkspaceOverview(&$doc, $wsid = null, $filter = 0, $pageId = -1)
+ *  128:     function getWorkspaceOverview(&$doc, $wsid = NULL, $filter = 0, $pageId = -1)
  *  192:     function hlSubelements(origId, verId, over, diffLayer)
  *
  *              SECTION: Private functions (do not use outside of this class!)
@@ -119,12 +119,12 @@ class wslib_gui {
         * or click-menu will not be generated properly!
         *
         * @param       object          $doc    Document (to use for formatting)
-        * @param       int             $wsid   Workspace ID, If <code>null</code>, the value is obtained from current BE user
+        * @param       int             $wsid   Workspace ID, If <code>NULL</code>, the value is obtained from current BE user
         * @param       int             $filter If 0, than no filtering, if 10 than select for publishing, otherwise stage value
         * @param       int             $pageId If greater than zero, than it is UID of page in LIVE workspaces to select records for
         * @return      string          Generated HTML
         */
-       function getWorkspaceOverview(&$doc, $wsid = null, $filter = 0, $pageId = -1) {
+       function getWorkspaceOverview(&$doc, $wsid = NULL, $filter = 0, $pageId = -1) {
                global  $LANG;
 
                // Setup
index bd8378b..d7c764d 100644 (file)
@@ -167,7 +167,7 @@ class SC_mod_user_ws_publish extends t3lib_SCbase {
 
                        if ($numRecs == 0) {
                                // All done
-                               $GLOBALS['BE_USER']->setAndSaveSessionData('workspacePublisher', null);
+                               $GLOBALS['BE_USER']->setAndSaveSessionData('workspacePublisher', NULL);
                                $GLOBALS['BE_USER']->setAndSaveSessionData('workspacePublisher_count', 0);
                                $content .= '<div id="progress-block"><h3>' . $this->title . '</h3><p>';
                                $content .= $GLOBALS['LANG']->getLL($this->isSwap ? 'workspace_swapped' : 'workspace_published');
index abc87e0..9a940b8 100644 (file)
@@ -56,7 +56,7 @@ class WorkspaceSelectorToolbarItem implements backend_toolbarItem {
         *
         * @param       TYPO3backend    TYPO3 backend object reference
         */
-       public function __construct(TYPO3backend &$backendReference = null) {
+       public function __construct(TYPO3backend &$backendReference = NULL) {
                $this->backendReference       = $backendReference;
                $this->changeWorkspace        = t3lib_div::_GP('changeWorkspace');
                $this->changeWorkspacePreview = t3lib_div::_GP('changeWorkspacePreview');
index ac9e777..ad1bb62 100644 (file)
@@ -206,7 +206,7 @@ class tx_Workspaces_ExtDirect_MassActionHandler extends tx_Workspaces_ExtDirect_
 
                if ($numRecs == 0) {
                                // All done
-                       $GLOBALS['BE_USER']->setAndSaveSessionData('workspaceMassAction', null);
+                       $GLOBALS['BE_USER']->setAndSaveSessionData('workspaceMassAction', NULL);
                        $GLOBALS['BE_USER']->setAndSaveSessionData('workspaceMassAction_total', 0);
                } else {
                                // Execute the commands:
index e9c17e1..bcaa696 100644 (file)
@@ -225,7 +225,7 @@ class Tx_Workspaces_Service_Stages {
                        default:
                                $stageTitle = $this->getPropertyOfCurrentWorkspaceStage($ver_stage, 'title');
 
-                               if ($stageTitle == null) {
+                               if ($stageTitle == NULL) {
                                        $stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:error.getStageTitle.stageNotFound');
                                }
                                break;
index 02eacd3..25d557f 100644 (file)
@@ -487,7 +487,7 @@ class tx_Workspaces_Service_Workspaces {
         * @param  $record
         * @return string
         */
-       public static function viewSingleRecord($table, $uid, $record=null) {
+       public static function viewSingleRecord($table, $uid, $record=NULL) {
                $viewUrl = '';
                if ($table == 'pages') {
                        $viewUrl = t3lib_BEfunc::viewOnClick(t3lib_BEfunc::getLiveVersionIdOfRecord('pages', $uid));
@@ -498,7 +498,7 @@ class tx_Workspaces_Service_Workspaces {
                        if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['workspaces']['viewSingleRecord'])) {
                                $_params = array('table' => $table, 'uid' => $uid, 'record' => $record);
                                $_funcRef = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['workspaces']['viewSingleRecord'];
-                               $viewUrl = t3lib_div::callUserFunction($_funcRef, $_params, null);
+                               $viewUrl = t3lib_div::callUserFunction($_funcRef, $_params, NULL);
                        }
                }
                return $viewUrl;