Laravel 5.5 update

patrickbrouwers · patrickbrouwers · commit fc021c5a53ac · 2017-08-31T21:50:09.000+02:00
diff --git a/config/doctrine.php b/config/doctrine.php
@@ -25,11 +25,9 @@
             'dev'           => env('APP_DEBUG'),
             'meta'          => env('DOCTRINE_METADATA', 'annotations'),
             'connection'    => env('DB_CONNECTION', 'mysql'),
-            'namespaces'    => [
-                'App'
-            ],
+            'namespaces'    => [],
             'paths'         => [
-                base_path('app')
+                base_path('app/Entities')
             ],
             'repository'    => Doctrine\ORM\EntityRepository::class,
             'proxies'       => [
diff --git a/src/Console/ClearMetadataCacheCommand.php b/src/Console/ClearMetadataCacheCommand.php
@@ -29,7 +29,7 @@ class ClearMetadataCacheCommand extends Command
      *
      * @param ManagerRegistry $registry
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();
 
diff --git a/src/Console/ClearQueryCacheCommand.php b/src/Console/ClearQueryCacheCommand.php
@@ -29,7 +29,7 @@ class ClearQueryCacheCommand extends Command
      *
      * @param ManagerRegistry $registry
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();
 
diff --git a/src/Console/ClearResultCacheCommand.php b/src/Console/ClearResultCacheCommand.php
@@ -29,7 +29,7 @@ class ClearResultCacheCommand extends Command
      *
      * @param ManagerRegistry $registry
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();
 
diff --git a/src/Console/ConvertMappingCommand.php b/src/Console/ConvertMappingCommand.php
@@ -39,7 +39,7 @@ class ConvertMappingCommand extends Command
      * @throws \Doctrine\ORM\Tools\Export\ExportException
      * @return int
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();
 
diff --git a/src/Console/EnsureProductionSettingsCommand.php b/src/Console/EnsureProductionSettingsCommand.php
@@ -26,7 +26,7 @@ class EnsureProductionSettingsCommand extends Command
      *
      * @param ManagerRegistry $registry
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();
 
diff --git a/src/Console/GenerateEntitiesCommand.php b/src/Console/GenerateEntitiesCommand.php
@@ -37,7 +37,7 @@ class GenerateEntitiesCommand extends Command
      * @throws \Doctrine\ORM\Tools\Export\ExportException
      * @return int
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();
 
diff --git a/src/Console/GenerateProxiesCommand.php b/src/Console/GenerateProxiesCommand.php
@@ -28,7 +28,7 @@ class GenerateProxiesCommand extends Command
      *
      * @param ManagerRegistry $registry
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();
 
diff --git a/src/Console/InfoCommand.php b/src/Console/InfoCommand.php
@@ -28,7 +28,7 @@ class InfoCommand extends Command
      *
      * @throws Exception
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();
         $exit  = 0;
diff --git a/src/Console/MappingImportCommand.php b/src/Console/MappingImportCommand.php
@@ -35,7 +35,7 @@ class MappingImportCommand extends Command
      * @throws \Doctrine\ORM\Tools\Export\ExportException
      * @return int
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $emName = $this->option('em');
         $em     = $registry->getManager($emName);
diff --git a/src/Console/SchemaCreateCommand.php b/src/Console/SchemaCreateCommand.php
@@ -26,7 +26,7 @@ class SchemaCreateCommand extends Command
      *
      * @param ManagerRegistry $registry
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();
 
diff --git a/src/Console/SchemaDropCommand.php b/src/Console/SchemaDropCommand.php
@@ -28,7 +28,7 @@ class SchemaDropCommand extends Command
      *
      * @param ManagerRegistry $registry
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $this->error('ATTENTION: This operation should not be executed in a production environment.');
 
diff --git a/src/Console/SchemaUpdateCommand.php b/src/Console/SchemaUpdateCommand.php
@@ -28,7 +28,7 @@ class SchemaUpdateCommand extends Command
      *
      * @param ManagerRegistry $registry
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         if (!$this->option('sql') && (!$this->laravel->environment('local') && !$this->option('force'))) {
             $this->error('ATTENTION: This operation should not be executed in a production environment.');
diff --git a/src/Console/SchemaValidateCommand.php b/src/Console/SchemaValidateCommand.php
@@ -27,7 +27,7 @@ class SchemaValidateCommand extends Command
      *
      * @param ManagerRegistry $registry
      */
-    public function fire(ManagerRegistry $registry)
+    public function handle(ManagerRegistry $registry)
     {
         $names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();
         $exit  = 0;
diff --git a/src/Types/Json.php b/src/Types/Json.php
@@ -30,15 +30,6 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
         return $platform->getClobTypeDeclarationSQL($fieldDeclaration);
     }
 
-    /**
-     * When database value is null, we return null instead of empty array like our parent does.
-     * {@inheritdoc}
-     */
-    public function convertToPHPValue($value, AbstractPlatform $platform)
-    {
-        return $value === null ? null : parent::convertToPHPValue($value, $platform);
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/tests/Middleware/SubstituteBindingsTest.php b/tests/Middleware/SubstituteBindingsTest.php
@@ -93,7 +93,7 @@ public function test_entity_binding_get_null_entity()
         $router->get('foo/{entity}', [
             'middleware' => SubstituteBindings::class,
             'uses'       => function (BindableEntity $entity = null) {
-                return $entity->getName();
+                return $entity;
             },
         ]);
 
diff --git a/tests/Types/JsonTypeTest.php b/tests/Types/JsonTypeTest.php
@@ -33,9 +33,9 @@ public function test_it_returns_null_when_database_value_is_null()
         $this->assertNull($this->type->convertToPHPValue(null, $this->platform));
     }
 
-    public function test_it_returns_empty_array_when_database_value_is_empty()
+    public function test_it_returns_null_when_database_value_is_empty()
     {
-        $this->assertEquals([], $this->type->convertToPHPValue('', $this->platform));
+        $this->assertNull($this->type->convertToPHPValue('', $this->platform));
     }
 
     public function test_it_returns_array_when_database_value_is_json()

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class ClearMetadataCacheCommand extends Command`
`29`	`29`	`*`
`30`	`30`	`* @param ManagerRegistry $registry`
`31`	`31`	`*/`
`32`		`- public function fire(ManagerRegistry $registry)`
	`32`	`+ public function handle(ManagerRegistry $registry)`
`33`	`33`	`{`
`34`	`34`	`$names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class ClearQueryCacheCommand extends Command`
`29`	`29`	`*`
`30`	`30`	`* @param ManagerRegistry $registry`
`31`	`31`	`*/`
`32`		`- public function fire(ManagerRegistry $registry)`
	`32`	`+ public function handle(ManagerRegistry $registry)`
`33`	`33`	`{`
`34`	`34`	`$names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class ClearResultCacheCommand extends Command`
`29`	`29`	`*`
`30`	`30`	`* @param ManagerRegistry $registry`
`31`	`31`	`*/`
`32`		`- public function fire(ManagerRegistry $registry)`
	`32`	`+ public function handle(ManagerRegistry $registry)`
`33`	`33`	`{`
`34`	`34`	`$names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class ConvertMappingCommand extends Command`
`39`	`39`	`* @throws \Doctrine\ORM\Tools\Export\ExportException`
`40`	`40`	`* @return int`
`41`	`41`	`*/`
`42`		`- public function fire(ManagerRegistry $registry)`
	`42`	`+ public function handle(ManagerRegistry $registry)`
`43`	`43`	`{`
`44`	`44`	`$names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class EnsureProductionSettingsCommand extends Command`
`26`	`26`	`*`
`27`	`27`	`* @param ManagerRegistry $registry`
`28`	`28`	`*/`
`29`		`- public function fire(ManagerRegistry $registry)`
	`29`	`+ public function handle(ManagerRegistry $registry)`
`30`	`30`	`{`
`31`	`31`	`$names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class GenerateEntitiesCommand extends Command`
`37`	`37`	`* @throws \Doctrine\ORM\Tools\Export\ExportException`
`38`	`38`	`* @return int`
`39`	`39`	`*/`
`40`		`- public function fire(ManagerRegistry $registry)`
	`40`	`+ public function handle(ManagerRegistry $registry)`
`41`	`41`	`{`
`42`	`42`	`$names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class GenerateProxiesCommand extends Command`
`28`	`28`	`*`
`29`	`29`	`* @param ManagerRegistry $registry`
`30`	`30`	`*/`
`31`		`- public function fire(ManagerRegistry $registry)`
	`31`	`+ public function handle(ManagerRegistry $registry)`
`32`	`32`	`{`
`33`	`33`	`$names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class InfoCommand extends Command`
`28`	`28`	`*`
`29`	`29`	`* @throws Exception`
`30`	`30`	`*/`
`31`		`- public function fire(ManagerRegistry $registry)`
	`31`	`+ public function handle(ManagerRegistry $registry)`
`32`	`32`	`{`
`33`	`33`	`$names = $this->option('em') ? [$this->option('em')] : $registry->getManagerNames();`
`34`	`34`	`$exit = 0;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class MappingImportCommand extends Command`
`35`	`35`	`* @throws \Doctrine\ORM\Tools\Export\ExportException`
`36`	`36`	`* @return int`
`37`	`37`	`*/`
`38`		`- public function fire(ManagerRegistry $registry)`
	`38`	`+ public function handle(ManagerRegistry $registry)`
`39`	`39`	`{`
`40`	`40`	`$emName = $this->option('em');`
`41`	`41`	`$em = $registry->getManager($emName);`