Merge pull request #18 from citrus-framework/fix_klass

take64 · web-flow · commit 0ad5108ce12b · 2024-06-30T13:22:53.000+09:00
klassの修正
diff --git a/Makefile b/Makefile
@@ -31,3 +31,4 @@ composer_check:
 .PHONY: insights
 insights:
 	@./vendor/bin/phpinsights analyse ./src
+
diff --git a/composer.json b/composer.json
@@ -24,8 +24,8 @@
     "ext-pdo": "*"
   },
   "require-dev": {
-    "php": "^8.1",
-    "phpunit/phpunit": "^9.5",
+    "php": "^8.3",
+    "phpunit/phpunit": "^10.5",
     "nunomaduro/phpinsights": "^v2.0"
   },
   "autoload": {
diff --git a/phpinsights.php b/phpinsights.php
@@ -36,6 +36,7 @@
 
         // Style
         PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\ArbitraryParenthesesSpacingSniff::class,
+        PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ElseIfDeclarationSniff::class,
     ],
     'config' => [
         // Architecture
diff --git a/src/Database/Generate.php b/src/Database/Generate.php
@@ -160,7 +160,7 @@ public function property(string $class_prefix, string $table_name): void
             ->setClassComment($class_name)
             ->setExtends($extend_name)
             ->addMethod(
-                (new KlassMethod(KlassVisibility::TYPE_PUBLIC, 'callPrimaryKeys', false, 'call primary keys'))
+                (new KlassMethod(KlassVisibility::PUBLIC, 'callPrimaryKeys', false, 'call primary keys'))
                     ->setReturn(new KlassReturn('string[]'))
                     ->setBody(
                         <<<BODY
diff --git a/src/Sqlmap/Parser.php b/src/Sqlmap/Parser.php
@@ -109,7 +109,7 @@ public function parse(): void
         $this->statement->query = $this->_nodes($nodes);
 
         // キーワードの置換
-        if (true === Strings::isEmpty($this->parameter->schema))
+        if (true === Strings::isEmpty($this->parameter->schema ?? ''))
         {
             $this->parameter->schema = $this->dsn->schema;
         }
@@ -589,7 +589,7 @@ private function callNestPropertyValue(string $property)
         $result = $this->parameter;
         foreach ($properties as $one)
         {
-            $result = $result->$one;
+            $result = $result->$one ?? null;
         }
         return $result;
     }
diff --git a/tests/Sample/Business/Entity/UserEntity.php b/tests/Sample/Business/Entity/UserEntity.php
@@ -18,8 +18,6 @@ class UserEntity extends UserProperty implements ResultClass
 {
     use Entity;
 
-
-
     /**
      * {@inheritDoc}
      */
diff --git a/tests/Sample/Citrus_20190102000000_CreateTableUsers.php b/tests/Sample/Citrus_20190102000000_CreateTableUsers.php
@@ -16,7 +16,7 @@
 class Citrus_20190102000000_CreateTableUsers extends Item
 {
     /** @var string object name */
-    public $object_name = 'users';
+    public string $object_name = 'users';
 
 
 
diff --git a/tests/Sample/Integration/Condition/UserCondition.php b/tests/Sample/Integration/Condition/UserCondition.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * generated Citrus Condition file at 2020-07-11 19:02:50
+ * generated Citrus Condition file at 2024-06-30 04:20:15
  */
 
 namespace Test\Sample\Integration\Condition;
@@ -14,4 +14,5 @@
 class UserCondition extends \Test\Sample\Integration\Property\UserProperty
 {
     use \Citrus\Sqlmap\Condition;
+    use \Citrus\Variable\PathBinders;
 }
diff --git a/tests/Sample/Integration/Dao/UserDao.php b/tests/Sample/Integration/Dao/UserDao.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * generated Citrus Dao file at 2020-07-11 19:02:50
+ * generated Citrus Dao file at 2024-06-30 04:20:15
  */
 
 namespace Test\Sample\Integration\Dao;
@@ -13,6 +13,10 @@
  */
 class UserDao extends \Citrus\Sqlmap\Crud
 {
+    use \Citrus\Variable\Singleton;
+
+
+
     /** @var string SQLMAP path */
-    protected $sqlmap_path = __DIR__ . '/../Sqlmap/Users.xml';
+    protected string $sqlmap_path = __DIR__ . '/../Sqlmap/Users.xml';
 }
diff --git a/tests/Sample/Integration/Property/UserProperty.php b/tests/Sample/Integration/Property/UserProperty.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * generated Citrus Property file at 2020-07-11 19:02:50
+ * generated Citrus Property file at 2024-06-30 04:20:15
  */
 
 namespace Test\Sample\Integration\Property;
@@ -13,11 +13,11 @@
  */
 class UserProperty extends \Citrus\Database\Columns
 {
-    /** @var int  */
-    public $user_id;
+    /** @var int|null  */
+    public int|null $user_id = null;
 
-    /** @var string  */
-    public $name;
+    /** @var string|null  */
+    public string|null $name = null;
 
 
 
diff --git a/tests/Sqlmap/ParserTest.php b/tests/Sqlmap/ParserTest.php
@@ -29,18 +29,16 @@ class ParserTest extends TestCase
     use TestFile;
 
     /** @var string 出力ディレクトリ */
-    private $output_dir;
+    private string $output_dir;
 
     /** @var string SQLITEファイル */
-    private $sqlite_file;
+    private string $sqlite_file;
 
     /** @var array 設定配列 */
-    private $configures;
+    private array $configures;
 
     /** @var Connection */
-    private $connection;
-
-
+    private Connection $connection;
 
     /**
      * {@inheritDoc}
@@ -80,8 +78,6 @@ public function setUp(): void
         $this->connection = new Connection($dsn);
     }
 
-
-
     /**
      * {@inheritDoc}
      */
@@ -93,8 +89,6 @@ public function tearDown(): void
         $this->forceRemove($this->output_dir);
     }
 
-
-
     /**
      * @test
      * @throws SqlmapException
@@ -117,8 +111,6 @@ public function SELECT文を実行できる()
         $this->assertSame('hogehoge', $entity->name);
     }
 
-
-
     /**
      * @test
      * @throws SqlmapException
@@ -138,8 +130,6 @@ public function INSERT文を実行できる()
         $this->assertCount(3, $resultSet);
     }
 
-
-
     /**
      * @throws SqlmapException
      */
@@ -165,8 +155,6 @@ public function UPDATE文を実行できる()
         }
     }
 
-
-
     /**
      * @test
      * @throws SqlmapException

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function parse(): void`
`109`	`109`	`$this->statement->query = $this->_nodes($nodes);`
`110`	`110`
`111`	`111`	`// キーワードの置換`
`112`		`- if (true === Strings::isEmpty($this->parameter->schema))`
	`112`	`+ if (true === Strings::isEmpty($this->parameter->schema ?? ''))`
`113`	`113`	`{`
`114`	`114`	`$this->parameter->schema = $this->dsn->schema;`
`115`	`115`	`}`
`@@ -589,7 +589,7 @@ private function callNestPropertyValue(string $property)`
`589`	`589`	`$result = $this->parameter;`
`590`	`590`	`foreach ($properties as $one)`
`591`	`591`	`{`
`592`		`- $result = $result->$one;`
	`592`	`+ $result = $result->$one ?? null;`
`593`	`593`	`}`
`594`	`594`	`return $result;`
`595`	`595`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ class UserEntity extends UserProperty implements ResultClass`
`18`	`18`	`{`
`19`	`19`	`use Entity;`
`20`	`20`
`21`		`-`
`22`		`-`
`23`	`21`	`/**`
`24`	`22`	`* {@inheritDoc}`
`25`	`23`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`class Citrus_20190102000000_CreateTableUsers extends Item`
`17`	`17`	`{`
`18`	`18`	`/** @var string object name */`
`19`		`- public $object_name = 'users';`
	`19`	`+ public string $object_name = 'users';`
`20`	`20`
`21`	`21`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`	`5`	`/**`
`6`		`- * generated Citrus Condition file at 2020-07-11 19:02:50`
	`6`	`+ * generated Citrus Condition file at 2024-06-30 04:20:15`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`namespace Test\Sample\Integration\Condition;`
`@@ -14,4 +14,5 @@`
`14`	`14`	`class UserCondition extends \Test\Sample\Integration\Property\UserProperty`
`15`	`15`	`{`
`16`	`16`	`use \Citrus\Sqlmap\Condition;`
	`17`	`+ use \Citrus\Variable\PathBinders;`
`17`	`18`	`}`