Merge edd08f4 into 859ccf0

zendframework · Apr 3, 2015 · a6a16b1 · a6a16b1
2 parents 859ccf0 + edd08f4
commit a6a16b1
Show file tree

Hide file tree

Showing 44 changed files with 58 additions and 58 deletions.
diff --git a/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php b/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php
@@ -173,7 +173,7 @@ public function getAmbiguityIdentity()
      */
     public function getDbSelect()
     {
-        if ($this->dbSelect == null) {
+        if ($this->dbSelect === null) {
             $this->dbSelect = new Sql\Select();
         }
         return $this->dbSelect;

diff --git a/library/Zend/Barcode/Renderer/Image.php b/library/Zend/Barcode/Renderer/Image.php
@@ -375,7 +375,7 @@ protected function drawText($text, $size, $position, $font, $color, $alignment =
             $color & 0x0000FF
         );
 
-        if ($font == null) {
+        if ($font === null) {
             $font = 3;
         }
         $position[0] += $this->leftOffset;

diff --git a/library/Zend/Code/Generator/FileGenerator.php b/library/Zend/Code/Generator/FileGenerator.php
@@ -302,7 +302,7 @@ public function setClasses(array $classes)
      */
     public function getClass($name = null)
     {
-        if ($name == null) {
+        if ($name === null) {
             reset($this->classes);
 
             return current($this->classes);

diff --git a/library/Zend/Code/Generator/FileGeneratorRegistry.php b/library/Zend/Code/Generator/FileGeneratorRegistry.php
@@ -27,7 +27,7 @@ class FileGeneratorRegistry
      */
     public static function registerFileCodeGenerator(FileGenerator $fileCodeGenerator, $fileName = null)
     {
-        if ($fileName == null) {
+        if ($fileName === null) {
             $fileName = $fileCodeGenerator->getFilename();
         }
 

diff --git a/library/Zend/Code/Generator/PropertyGenerator.php b/library/Zend/Code/Generator/PropertyGenerator.php
@@ -204,7 +204,7 @@ public function generate()
         }
 
         if ($this->isConst()) {
-            if ($defaultValue != null && !$defaultValue->isValidConstantType()) {
+            if ($defaultValue !== null && !$defaultValue->isValidConstantType()) {
                 throw new Exception\RuntimeException(sprintf(
                     'The property %s is said to be '
                     . 'constant but does not have a valid constant value.',

diff --git a/library/Zend/Code/NameInformation.php b/library/Zend/Code/NameInformation.php
@@ -58,7 +58,7 @@ public function getNamespace()
      */
     public function hasNamespace()
     {
-        return ($this->namespace != null);
+        return ($this->namespace !== null);
     }
 
     /**

diff --git a/library/Zend/Code/Reflection/ParameterReflection.php b/library/Zend/Code/Reflection/ParameterReflection.php
@@ -40,7 +40,7 @@ public function getDeclaringClass()
     public function getClass()
     {
         $phpReflection = parent::getClass();
-        if ($phpReflection == null) {
+        if ($phpReflection === null) {
             return;
         }
 

diff --git a/library/Zend/Code/Scanner/ClassScanner.php b/library/Zend/Code/Scanner/ClassScanner.php
@@ -269,7 +269,7 @@ public function isInterface()
     public function hasParentClass()
     {
         $this->scan();
-        return ($this->parentClass != null);
+        return ($this->parentClass !== null);
     }
 
     /**

diff --git a/library/Zend/Code/Scanner/DerivedClassScanner.php b/library/Zend/Code/Scanner/DerivedClassScanner.php
@@ -123,7 +123,7 @@ public function getParentClasses()
      */
     public function hasParentClass()
     {
-        return ($this->classScanner->getParentClass() != null);
+        return ($this->classScanner->getParentClass() !== null);
     }
 
     /**

diff --git a/library/Zend/Code/Scanner/TokenArrayScanner.php b/library/Zend/Code/Scanner/TokenArrayScanner.php
@@ -587,7 +587,7 @@ protected function scan()
                         || ($tokenType === T_FUNCTION && $infos[$infoIndex]['type'] === 'function'))
                 ) {
                     $infos[$infoIndex]['shortName'] = $tokens[$tokenIndex + 2][1];
-                    $infos[$infoIndex]['name']      = (($namespace != null) ? $namespace . '\\' : '') . $infos[$infoIndex]['shortName'];
+                    $infos[$infoIndex]['name']      = (($namespace !== null) ? $namespace . '\\' : '') . $infos[$infoIndex]['shortName'];
                 }
 
                 if ($tokenType === null) {

diff --git a/library/Zend/Db/Adapter/Adapter.php b/library/Zend/Db/Adapter/Adapter.php
@@ -87,7 +87,7 @@ public function __construct($driver, Platform\PlatformInterface $platform = null
         $driver->checkEnvironment();
         $this->driver = $driver;
 
-        if ($platform == null) {
+        if ($platform === null) {
             $platform = $this->createPlatform($parameters);
         }
 
@@ -128,7 +128,7 @@ public function getProfiler()
      */
     public function getDriver()
     {
-        if ($this->driver == null) {
+        if ($this->driver === null) {
             throw new Exception\RuntimeException('Driver has not been set or configured for this adapter.');
         }
         return $this->driver;
@@ -209,7 +209,7 @@ public function query($sql, $parametersOrQueryMode = self::QUERY_MODE_PREPARE, R
     public function createStatement($initialSql = null, $initialParameters = null)
     {
         $statement = $this->driver->createStatement($initialSql);
-        if ($initialParameters == null || !$initialParameters instanceof ParameterContainer && is_array($initialParameters)) {
+        if ($initialParameters === null || !$initialParameters instanceof ParameterContainer && is_array($initialParameters)) {
             $initialParameters = new ParameterContainer((is_array($initialParameters) ? $initialParameters : array()));
         }
         $statement->setParameterContainer($initialParameters);

diff --git a/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php b/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
@@ -167,7 +167,7 @@ public function prepare($sql = null)
             throw new Exception\RuntimeException('This statement has been prepared already');
         }
 
-        if ($sql == null) {
+        if ($sql === null) {
             $sql = $this->sql;
         }
 

diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php b/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
@@ -297,7 +297,7 @@ public function getPrepareType()
      */
     public function formatParameterName($name, $type = null)
     {
-        if ($type == null && !is_numeric($name) || $type == self::PARAMETERIZATION_NAMED) {
+        if ($type === null && !is_numeric($name) || $type == self::PARAMETERIZATION_NAMED) {
             return ':' . $name;
         }
 

diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Statement.php b/library/Zend/Db/Adapter/Driver/Pdo/Statement.php
@@ -179,7 +179,7 @@ public function prepare($sql = null)
             throw new Exception\RuntimeException('This statement has been prepared already');
         }
 
-        if ($sql == null) {
+        if ($sql === null) {
             $sql = $this->sql;
         }
 

diff --git a/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php b/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
@@ -207,7 +207,7 @@ public function execute($sql)
      */
     public function getLastGeneratedValue($name = null)
     {
-        if ($name == null) {
+        if ($name === null) {
             return;
         }
         $result = pg_query($this->resource, 'SELECT CURRVAL(\'' . str_replace('\'', '\\\'', $name) . '\') as "currval"');

diff --git a/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
@@ -165,7 +165,7 @@ public function createStatement($sqlOrResource = null)
             $statement->initialize($this->connection->getResource());
             if (is_string($sqlOrResource)) {
                 $statement->setSql($sqlOrResource);
-            } elseif ($sqlOrResource != null) {
+            } elseif ($sqlOrResource !== null) {
                 throw new Exception\InvalidArgumentException('createStatement() only accepts an SQL string or a Sqlsrv resource');
             }
         }

diff --git a/library/Zend/Db/ResultSet/AbstractResultSet.php b/library/Zend/Db/ResultSet/AbstractResultSet.php
@@ -90,7 +90,7 @@ public function initialize($dataSource)
             throw new Exception\InvalidArgumentException('DataSource provided is not an array, nor does it implement Iterator or IteratorAggregate');
         }
 
-        if ($this->count == null && $this->dataSource instanceof Countable) {
+        if ($this->count === null && $this->dataSource instanceof Countable) {
             $this->count = $this->dataSource->count();
         }
 

diff --git a/library/Zend/Db/RowGateway/AbstractRowGateway.php b/library/Zend/Db/RowGateway/AbstractRowGateway.php
@@ -71,7 +71,7 @@ public function initialize()
             throw new Exception\RuntimeException('This row object does not have a valid table set.');
         }
 
-        if ($this->primaryKeyColumn == null) {
+        if ($this->primaryKeyColumn === null) {
             throw new Exception\RuntimeException('This row object does not have a primary key column set.');
         } elseif (is_string($this->primaryKeyColumn)) {
             $this->primaryKeyColumn = (array) $this->primaryKeyColumn;

diff --git a/library/Zend/Db/Sql/Predicate/Predicate.php b/library/Zend/Db/Sql/Predicate/Predicate.php
@@ -57,7 +57,7 @@ public function setUnnest(Predicate $predicate)
      */
     public function unnest()
     {
-        if ($this->unnest == null) {
+        if ($this->unnest === null) {
             throw new RuntimeException('Not nested');
         }
         $unnest       = $this->unnest;

diff --git a/library/Zend/Db/Sql/Sql.php b/library/Zend/Db/Sql/Sql.php
@@ -48,7 +48,7 @@ public function getAdapter()
 
     public function hasTable()
     {
-        return ($this->table != null);
+        return ($this->table !== null);
     }
 
     public function setTable($table)

diff --git a/library/Zend/Db/Sql/TableIdentifier.php b/library/Zend/Db/Sql/TableIdentifier.php
@@ -85,7 +85,7 @@ public function getTable()
      */
     public function hasSchema()
     {
-        return ($this->schema != null);
+        return ($this->schema !== null);
     }
 
     /**

diff --git a/library/Zend/Db/Sql/Update.php b/library/Zend/Db/Sql/Update.php
@@ -92,7 +92,7 @@ public function table($table)
      */
     public function set(array $values, $flag = self::VALUES_SET)
     {
-        if ($values == null) {
+        if ($values === null) {
             throw new Exception\InvalidArgumentException('set() expects an array of values');
         }
 

diff --git a/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php b/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
@@ -62,7 +62,7 @@ public function getSlaveSql()
     public function postInitialize()
     {
         $this->masterSql = $this->tableGateway->sql;
-        if ($this->slaveSql == null) {
+        if ($this->slaveSql === null) {
             $this->slaveSql = new Sql(
                 $this->slaveAdapter,
                 $this->tableGateway->sql->getTable(),

diff --git a/library/Zend/Db/TableGateway/Feature/MetadataFeature.php b/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
@@ -39,7 +39,7 @@ public function __construct(MetadataInterface $metadata = null)
 
     public function postInitialize()
     {
-        if ($this->metadata == null) {
+        if ($this->metadata === null) {
             $this->metadata = new Metadata($this->tableGateway->adapter);
         }
 

diff --git a/library/Zend/Di/Definition/CompilerDefinition.php b/library/Zend/Di/Definition/CompilerDefinition.php
@@ -100,7 +100,7 @@ public function addDirectoryScanner(DirectoryScanner $directoryScanner)
      */
     public function addCodeScannerFile(FileScanner $fileScanner)
     {
-        if ($this->directoryScanner == null) {
+        if ($this->directoryScanner === null) {
             $this->directoryScanner = new DirectoryScanner();
         }
 
@@ -185,7 +185,7 @@ protected function processClass($class)
 
         $def['supertypes'] = $supertypes;
 
-        if ($def['instantiator'] == null) {
+        if ($def['instantiator'] === null) {
             if ($rClass->isInstantiable()) {
                 $def['instantiator'] = '__construct';
             }

diff --git a/library/Zend/Di/Definition/RuntimeDefinition.php b/library/Zend/Di/Definition/RuntimeDefinition.php
@@ -233,7 +233,7 @@ protected function processClass($class, $forceLoad = false)
 
         $def['supertypes'] = array_keys(array_flip($supertypes));
 
-        if ($def['instantiator'] == null) {
+        if ($def['instantiator'] === null) {
             if ($rClass->isInstantiable()) {
                 $def['instantiator'] = '__construct';
             }

diff --git a/library/Zend/Feed/Reader/Entry/Rss.php b/library/Zend/Feed/Reader/Entry/Rss.php
@@ -204,7 +204,7 @@ public function getDateModified()
                             $date = date_create_from_format($standard, $dateModified);
                             break;
                         } catch (\Exception $e) {
-                            if ($standard == null) {
+                            if ($standard === null) {
                                 throw new Exception\RuntimeException(
                                     'Could not load date due to unrecognised'
                                     .' format (should follow RFC 822 or 2822):'

diff --git a/library/Zend/Feed/Reader/Feed/Rss.php b/library/Zend/Feed/Reader/Feed/Rss.php
@@ -212,7 +212,7 @@ public function getDateModified()
                             $date = DateTime::createFromFormat($standard, $dateModified);
                             break;
                         } catch (\Exception $e) {
-                            if ($standard == null) {
+                            if ($standard === null) {
                                 throw new Exception\RuntimeException(
                                     'Could not load date due to unrecognised'
                                     .' format (should follow RFC 822 or 2822):'
@@ -272,7 +272,7 @@ public function getLastBuildDate()
                             $date = DateTime::createFromFormat($standard, $lastBuildDateParsed);
                             break;
                         } catch (\Exception $e) {
-                            if ($standard == null) {
+                            if ($standard === null) {
                                 throw new Exception\RuntimeException(
                                     'Could not load date due to unrecognised'
                                     .' format (should follow RFC 822 or 2822):'

diff --git a/library/Zend/File/Transfer/Adapter/AbstractAdapter.php b/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
@@ -441,7 +441,7 @@ public function getValidator($name)
      */
     public function getValidators($files = null)
     {
-        if ($files == null) {
+        if ($files === null) {
             return $this->validators;
         }
 

diff --git a/library/Zend/Filter/Word/SeparatorToSeparator.php b/library/Zend/Filter/Word/SeparatorToSeparator.php
@@ -87,7 +87,7 @@ public function filter($value)
             return $value;
         }
 
-        if ($this->searchSeparator == null) {
+        if ($this->searchSeparator === null) {
             throw new Exception\RuntimeException('You must provide a search separator for this filter to work.');
         }
 

diff --git a/library/Zend/Form/Fieldset.php b/library/Zend/Form/Fieldset.php
@@ -203,7 +203,7 @@ public function add($elementOrFieldset, array $flags = array())
      */
     public function has($elementOrFieldset)
     {
-        return $this->iterator->get($elementOrFieldset) != null;
+        return $this->iterator->get($elementOrFieldset) !== null;
     }
 
     /**

diff --git a/library/Zend/Http/Response/Stream.php b/library/Zend/Http/Response/Stream.php
@@ -231,7 +231,7 @@ public static function fromStream($responseString, $stream)
      */
     public function getBody()
     {
-        if ($this->stream != null) {
+        if ($this->stream !== null) {
             $this->readStream();
         }
         return parent::getBody();

diff --git a/library/Zend/I18n/Validator/DateTime.php b/library/Zend/I18n/Validator/DateTime.php
@@ -298,7 +298,7 @@ public function isValid($value)
      */
     protected function getIntlDateFormatter()
     {
-        if ($this->formatter == null || $this->invalidateFormatter) {
+        if ($this->formatter === null || $this->invalidateFormatter) {
             $this->formatter = new IntlDateFormatter(
                 $this->getLocale(),
                 $this->getDateType(),

diff --git a/library/Zend/Json/Json.php b/library/Zend/Json/Json.php
@@ -333,7 +333,7 @@ public static function fromXml($xmlStringContents, $ignoreXmlAttributes = true)
         // If it is not a valid XML content, throw an exception.
         if (!$simpleXmlElementObject) {
             throw new RuntimeException('Function fromXml was called with an invalid XML formatted string.');
-        } // End of if ($simpleXmlElementObject == null)
+        } // End of if ($simpleXmlElementObject === null)
 
         // Call the recursive function to convert the XML into a PHP array.
         $resultArray = static::_processXml($simpleXmlElementObject, $ignoreXmlAttributes);

diff --git a/library/Zend/Mail/Protocol/Imap.php b/library/Zend/Mail/Protocol/Imap.php
@@ -651,7 +651,7 @@ public function store(array $flags, $from, $to = null, $mode = null, $silent = t
 
         $flags = $this->escapeList($flags);
         $set = (int) $from;
-        if ($to != null) {
+        if ($to !== null) {
             $set .= ':' . ($to == INF ? '*' : (int) $to);
         }
 
@@ -710,7 +710,7 @@ public function append($folder, $message, $flags = null, $date = null)
     public function copy($folder, $from, $to = null)
     {
         $set = (int) $from;
-        if ($to != null) {
+        if ($to !== null) {
             $set .= ':' . ($to == INF ? '*' : (int) $to);
         }
 

diff --git a/library/Zend/Mail/Protocol/Smtp.php b/library/Zend/Mail/Protocol/Smtp.php
@@ -117,7 +117,7 @@ public function __construct($host = '127.0.0.1', $port = null, array $config = n
                 case 'ssl':
                     $this->transport = 'ssl';
                     $this->secure = 'ssl';
-                    if ($port == null) {
+                    if ($port === null) {
                         $port = 465;
                     }
                     break;
@@ -128,7 +128,7 @@ public function __construct($host = '127.0.0.1', $port = null, array $config = n
         }
 
         // If no port has been specified then check the master PHP ini file. Defaults to 25 if the ini setting is null.
-        if ($port == null) {
+        if ($port === null) {
             if (($port = ini_get('smtp_port')) == '') {
                 $port = 25;
             }

diff --git a/library/Zend/Mail/Storage/Imap.php b/library/Zend/Mail/Storage/Imap.php
@@ -388,7 +388,7 @@ public function createFolder($name, $parentFolder = null)
         // TODO: we assume / as the hierarchy delim - need to get that from the folder class!
         if ($parentFolder instanceof Folder) {
             $folder = $parentFolder->getGlobalName() . '/' . $name;
-        } elseif ($parentFolder != null) {
+        } elseif ($parentFolder !== null) {
             $folder = $parentFolder . '/' . $name;
         } else {
             $folder = $name;

diff --git a/library/Zend/Mail/Storage/Writable/Maildir.php b/library/Zend/Mail/Storage/Writable/Maildir.php
@@ -107,7 +107,7 @@ public function createFolder($name, $parentFolder = null)
     {
         if ($parentFolder instanceof Folder) {
             $folder = $parentFolder->getGlobalName() . $this->delim . $name;
-        } elseif ($parentFolder != null) {
+        } elseif ($parentFolder !== null) {
             $folder = rtrim($parentFolder, $this->delim) . $this->delim . $name;
         } else {
             $folder = $name;