Merge pull request #6535 from Majkl578/phpstan

[master] PHPStan integration - levels 0 + 1

.travis.yml

@@ -14,13 +14,16 @@ env:
 before_script:
   - if [[ $TRAVIS_PHP_VERSION = '7.1' && $DB = 'sqlite' && "$DEPENDENCIES" != "low" ]]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; else PHPUNIT_FLAGS=""; fi
   - if [[ "$PHPUNIT_FLAGS" == "" ]]; then phpenv config-rm xdebug.ini; fi
+  - if [[ $PHPSTAN = 1 ]]; then echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
   - composer self-update
   - composer install --prefer-source
   - if [ "$DEPENDENCIES" != "low" ]; then composer update; fi;
   - if [ "$DEPENDENCIES" == "low" ]; then composer update --prefer-lowest; fi;
+  - if [[ $PHPSTAN = 1 ]]; then composer require --dev --prefer-stable phpstan/phpstan:^0.7 symfony/console:^3.0; fi
   - if [[ $DB == "mysql" || $DB == "mariadb" ]]; then mysql -e "CREATE SCHEMA doctrine_tests; GRANT ALL PRIVILEGES ON doctrine_tests.* to travis@'%'"; fi;
 
 script:
+  - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -l 1 -c phpstan.neon lib; fi
   - ENABLE_SECOND_LEVEL_CACHE=0 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml $PHPUNIT_FLAGS
   - ENABLE_SECOND_LEVEL_CACHE=1 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml --exclude-group performance,non-cacheable,locking_functional
 
@@ -39,6 +42,10 @@ matrix:
       env:
         - DB=sqlite
         - DEPENDENCIES='low'
+    - php: 7.1
+      env:
+        - DB=pgsql
+        - PHPSTAN=1
 
   allow_failures:
     - php: nightly

lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php

@@ -548,7 +548,10 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
         $hasCache  = ($persister instanceof CachedPersister);
         $key       = null;
 
-        if ($hasCache) {
+        if ( ! $hasCache) {
+            return $this->persister->loadManyToManyCollection($assoc, $sourceEntity, $coll);
+        }
+
         $ownerId = $this->uow->getEntityIdentifier($coll->getOwner());
         $key     = $this->buildCollectionCacheKey($assoc, $ownerId);
         $list    = $persister->loadCollectionCache($coll, $key);
@@ -560,17 +563,14 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
 
             return $list;
         }
-        }
 
         $list = $this->persister->loadManyToManyCollection($assoc, $sourceEntity, $coll);
 
-        if ($hasCache) {
         $persister->storeCollectionCache($key, $list);
 
         if ($this->cacheLogger) {
             $this->cacheLogger->collectionCacheMiss($persister->getCacheRegion()->getName(), $key);
         }
-        }
 
         return $list;
     }
@@ -583,7 +583,10 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
         $persister = $this->uow->getCollectionPersister($assoc);
         $hasCache  = ($persister instanceof CachedPersister);
 
-        if ($hasCache) {
+        if ( ! $hasCache) {
+            return $this->persister->loadOneToManyCollection($assoc, $sourceEntity, $coll);
+        }
+
         $ownerId = $this->uow->getEntityIdentifier($coll->getOwner());
         $key     = $this->buildCollectionCacheKey($assoc, $ownerId);
         $list    = $persister->loadCollectionCache($coll, $key);
@@ -595,17 +598,14 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
 
             return $list;
         }
-        }
 
         $list = $this->persister->loadOneToManyCollection($assoc, $sourceEntity, $coll);
 
-        if ($hasCache) {
         $persister->storeCollectionCache($key, $list);
 
         if ($this->cacheLogger) {
             $this->cacheLogger->collectionCacheMiss($persister->getCacheRegion()->getName(), $key);
         }
-        }
 
         return $list;
     }

lib/Doctrine/ORM/PersistentCollection.php

@@ -514,10 +514,11 @@ final class PersistentCollection extends AbstractLazyCollection implements Selec
     public function offsetSet($offset, $value)
     {
         if ( ! isset($offset)) {
-            return $this->add($value);
+            $this->add($value);
+            return;
         }
 
-        return $this->set($offset, $value);
+        $this->set($offset, $value);
     }
 
     /**

lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php

@@ -542,6 +542,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
         $identifier1 = $this->uow->getEntityIdentifier($collection->getOwner());
         $identifier2 = $this->uow->getEntityIdentifier($element);
 
+        $class1 = $class2 = null;
         if ($isComposite) {
             $class1 = $this->em->getClassMetadata(get_class($collection->getOwner()));
             $class2 = $collection->getTypeClass();

lib/Doctrine/ORM/Query/ResultSetMapping.php

@@ -451,7 +451,7 @@ class ResultSetMapping
     /**
      * @param string $alias
      *
-     * @return AssociationMapping
+     * @return string
      */
     public function getRelation($alias)
     {

lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php

@@ -102,6 +102,7 @@ class PhpExporter extends AbstractExporter
                 $cascade = ['all'];
             }
 
+            $method = null;
             $associationMappingArray = [
                 'fieldName'    => $associationMapping['fieldName'],
                 'targetEntity' => $associationMapping['targetEntity'],
@@ -129,6 +130,7 @@ class PhpExporter extends AbstractExporter
                     'orphanRemoval',
                     'orderBy',
                 ];
+                $oneToManyMappingArray = [];
                 foreach ($potentialAssociationMappingIndexes as $index) {
                     if (isset($associationMapping[$index])) {
                         $oneToManyMappingArray[$index] = $associationMapping[$index];
@@ -142,6 +144,7 @@ class PhpExporter extends AbstractExporter
                     'joinTable',
                     'orderBy',
                 ];
+                $manyToManyMappingArray = [];
                 foreach ($potentialAssociationMappingIndexes as $index) {
                     if (isset($associationMapping[$index])) {
                         $manyToManyMappingArray[$index] = $associationMapping[$index];

lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php

@@ -240,6 +240,7 @@ class XmlExporter extends AbstractExporter
         });
 
         foreach ($metadata->associationMappings as $associationMapping) {
+            $associationMappingXml = null;
             if ($associationMapping['type'] == ClassMetadataInfo::ONE_TO_ONE) {
                 $associationMappingXml = $root->addChild('one-to-one');
             } elseif ($associationMapping['type'] == ClassMetadataInfo::MANY_TO_ONE) {

phpstan.neon

@@ -0,0 +1,7 @@
+parameters:
+    earlyTerminatingMethodCalls:
+        Doctrine\ORM\Query\Parser:
+            - syntaxError
+    ignoreErrors:
+        # Memcache does not exist on PHP 7
+        - '#Instantiated class Memcache not found#'