Merge remote-tracking branch 'origin/2.x'

sonata-project · Mar 16, 2019 · b84d4e8 · b84d4e8
2 parents 563a6d8 + 26d0a81
commit b84d4e8
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/src/Bundle/BundleMetadata.php b/src/Bundle/BundleMetadata.php
@@ -60,17 +60,17 @@ class BundleMetadata
     /**
      * @var OrmMetadata
      */
-    protected $ormMetadata = null;
+    protected $ormMetadata;
 
     /**
      * @var OdmMetadata
      */
-    protected $odmMetadata = null;
+    protected $odmMetadata;
 
     /**
      * @var PhpcrMetadata
      */
-    protected $phpcrMetadata = null;
+    protected $phpcrMetadata;
 
     /**
      * @var string

diff --git a/src/Generator/BundleGenerator.php b/src/Generator/BundleGenerator.php
@@ -25,7 +25,7 @@ class BundleGenerator implements GeneratorInterface
 
     public function __construct()
     {
-        $this->bundleTemplate = file_get_contents(__DIR__.'/../Resources/skeleton/bundle/bundle.mustache');
+        $this->bundleTemplate = (string) file_get_contents(__DIR__.'/../Resources/skeleton/bundle/bundle.mustache');
     }
 
     /**

diff --git a/src/Generator/OdmGenerator.php b/src/Generator/OdmGenerator.php
@@ -30,8 +30,8 @@ class OdmGenerator implements GeneratorInterface
 
     public function __construct()
     {
-        $this->documentTemplate = file_get_contents(__DIR__.'/../Resources/skeleton/odm/document.mustache');
-        $this->documentRepositoryTemplate = file_get_contents(__DIR__.'/../Resources/skeleton/odm/repository.mustache');
+        $this->documentTemplate = (string) file_get_contents(__DIR__.'/../Resources/skeleton/odm/document.mustache');
+        $this->documentRepositoryTemplate = (string) file_get_contents(__DIR__.'/../Resources/skeleton/odm/repository.mustache');
     }
 
     /**

diff --git a/src/Generator/OrmGenerator.php b/src/Generator/OrmGenerator.php
@@ -30,8 +30,8 @@ class OrmGenerator implements GeneratorInterface
 
     public function __construct()
     {
-        $this->entityTemplate = file_get_contents(__DIR__.'/../Resources/skeleton/orm/entity.mustache');
-        $this->entityRepositoryTemplate = file_get_contents(__DIR__.'/../Resources/skeleton/orm/repository.mustache');
+        $this->entityTemplate = (string) file_get_contents(__DIR__.'/../Resources/skeleton/orm/entity.mustache');
+        $this->entityRepositoryTemplate = (string) file_get_contents(__DIR__.'/../Resources/skeleton/orm/repository.mustache');
     }
 
     /**

diff --git a/src/Generator/PHPCRGenerator.php b/src/Generator/PHPCRGenerator.php
@@ -30,8 +30,8 @@ class PHPCRGenerator implements GeneratorInterface
 
     public function __construct()
     {
-        $this->DocumentTemplate = file_get_contents(__DIR__.'/../Resources/skeleton/phpcr/document.mustache');
-        $this->DocumentRepositoryTemplate = file_get_contents(
+        $this->DocumentTemplate = (string) file_get_contents(__DIR__.'/../Resources/skeleton/phpcr/document.mustache');
+        $this->DocumentRepositoryTemplate = (string) file_get_contents(
             __DIR__.'/../Resources/skeleton/phpcr/repository.mustache'
         );
     }

diff --git a/src/Generator/SerializerGenerator.php b/src/Generator/SerializerGenerator.php
@@ -30,10 +30,10 @@ class SerializerGenerator implements GeneratorInterface
 
     public function __construct()
     {
-        $this->entitySerializerTemplate = file_get_contents(
+        $this->entitySerializerTemplate = (string) file_get_contents(
             __DIR__.'/../Resources/skeleton/serializer/entity.mustache'
         );
-        $this->documentSerializerTemplate = file_get_contents(
+        $this->documentSerializerTemplate = (string) file_get_contents(
             __DIR__.'/../Resources/skeleton/serializer/document.mustache'
         );
     }

diff --git a/src/Mapper/DoctrineCollector.php b/src/Mapper/DoctrineCollector.php
@@ -51,7 +51,7 @@ class DoctrineCollector
     protected $overrides;
 
     /**
-     * @var DoctrineCollector
+     * @var DoctrineCollector|null
      */
     private static $instance;
 
@@ -65,7 +65,7 @@ public function __construct()
      */
     public static function getInstance(): self
     {
-        if (!self::$instance) {
+        if (null === self::$instance) {
             self::$instance = new self();
         }