Merge branch '2.0' into 2.1

b2pweb · Jan 3, 2023 · 52de300 · 52de300
2 parents e62268e + e332e7c
commit 52de300
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 10 deletions.
diff --git a/src/Console/HydratorGenerationCommand.php b/src/Console/HydratorGenerationCommand.php
@@ -137,7 +137,7 @@ private function configureOutputs($io): void
      */
     private function generateHydrator($io, $className, Mapper $mapper): void
     {
-        $io->inline("Generate hydrator for ${className} ");
+        $io->inline("Generate hydrator for {$className} ");
 
         try {
             $generator = new HydratorGenerator($this->locator, $mapper, $className);
@@ -185,26 +185,26 @@ private function generateLoader($io): void
             $embeddeds = $className::embeddedPrimeClasses();
 
             if (empty($embeddeds)) {
-                $hydrators[] = "'{$className::supportedPrimeClassName()}' => new ${className}(),";
+                $hydrators[] = "'{$className::supportedPrimeClassName()}' => new {$className}(),";
             } else {
                 $arguments = [];
 
                 foreach ($embeddeds as $entity) {
-                    $arguments[] = "\$registry->get('${entity}')";
+                    $arguments[] = "\$registry->get('{$entity}')";
                 }
 
                 $arguments = implode(', ', $arguments);
-                $closure = "function(\$registry) {return new ${className}(${arguments});}";
+                $closure = "function(\$registry) {return new {$className}({$arguments});}";
 
-                $factories[] = "'{$className::supportedPrimeClassName()}' => ${closure},";
+                $factories[] = "'{$className::supportedPrimeClassName()}' => {$closure},";
             }
         }
 
         $content = "<?php\n";
 
         if ($io->option('include')) {
             foreach ($includes as $file) {
-                $content .= "require_once __DIR__.DIRECTORY_SEPARATOR.'${file}';\n";
+                $content .= "require_once __DIR__.DIRECTORY_SEPARATOR.'{$file}';\n";
             }
         } else {
             $io->block([

diff --git a/src/Schema/Inflector/SimpleInfector.php b/src/Schema/Inflector/SimpleInfector.php
@@ -43,6 +43,6 @@ public function getPropertyName(string $table, string $field): string
      */
     public function getSequenceName(string $table): string
     {
-        return "${table}_seq";
+        return "{$table}_seq";
     }
 }
diff --git a/tests/Query/ExpressionTest.php b/tests/Query/ExpressionTest.php
@@ -15,7 +15,8 @@ class ExpressionTest extends TestCase
 
     protected $repository;
     protected $query;
-
+    protected $table;
+
     protected function setUp(): void
     {
         $this->primeStart();
@@ -143,4 +144,4 @@ public function test_match_expression_in_boolean_mode()
             ->toSql()
         );
     }
-}
+}
diff --git a/tests/Query/QueryOrmTest.php b/tests/Query/QueryOrmTest.php
@@ -32,6 +32,7 @@ class QueryOrmTest extends TestCase
 
     protected $repository;
     protected $query;
+    protected $table;
 
     /**
      *

diff --git a/tests/Sharding/Query/ShardingInsertQueryTest.php b/tests/Sharding/Query/ShardingInsertQueryTest.php
@@ -27,6 +27,14 @@ class ShardingInsertQueryTest extends TestCase
      * @var ShardingConnection
      */
     private $connection;
+    /**
+     * @var ShardingConnectionFactory
+     */
+    private $factory;
+    /**
+     * @var ConnectionRegistry
+     */
+    private $registry;
 
     /**
      *

diff --git a/tests/Sharding/Query/ShardingKeyValueQueryTest.php b/tests/Sharding/Query/ShardingKeyValueQueryTest.php
@@ -26,6 +26,15 @@ class ShardingKeyValueQueryTest extends TestCase
      */
     private $connection;
 
+    /**
+     * @var ShardingConnectionFactory
+     */
+    private $factory;
+    /**
+     * @var ConnectionRegistry
+     */
+    private $registry;
+
     /**
      * @var ConnectionInterface
      */

diff --git a/tests/Sharding/ShardingConnectionTest.php b/tests/Sharding/ShardingConnectionTest.php
@@ -24,7 +24,16 @@ class ShardingConnectionTest extends TestCase
 
     /** @var ConnectionManager $connections */
     protected $connections;
-
+
+    /**
+     * @var ShardingConnectionFactory
+     */
+    private $factory;
+    /**
+     * @var ConnectionRegistry
+     */
+    private $registry;
+
     /**
      * 
      */