Merge pull request #12 from tsukabo/dev/cake5

CakePHP5に対応させる
kozo · Nov 21, 2023 · b3b47e3 · b3b47e3
2 parents a1b96de + 42144cb
commit b3b47e3
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/composer.phar
+/composer.lock
+/vendor
diff --git a/README.md b/README.md
@@ -5,17 +5,17 @@ Partial Plugin is CakePHP element of small scope.
 ## Installation
 
 ```
-composer require kozo/partial:"~3.0"
+composer require kozo/partial:"~5.0"
 ```
 
-
 ## Usage
 
 AppView.php
 ```
 use Partial\View\PartialTrait;
 
-class AppView extends View {
+class AppView extends View
+{
 	use PartialTrait;
 }
 ```

diff --git a/composer.json b/composer.json
@@ -11,8 +11,11 @@
         "role": "Author"
     }],
     "require": {
-        "cakephp/cakephp": "~3.5|~4.0",
-        "cakephp/plugin-installer": "*"
+        "php": ">=8.1.0",
+        "cakephp/cakephp": "~5.0"
+    },
+    "require-dev": {
+        "cakephp/cakephp-codesniffer": "*"
     },
     "extra": {
         "installer-name": "Partial"
@@ -21,5 +24,14 @@
         "psr-4": {
             "Partial\\": "src"
         }
+    },
+    "scripts": {
+        "phpcs": "phpcs --colors -p -s --standard=CakePHP src/",
+        "phpcbf": "phpcbf --colors --parallel=16 -p src/"
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
-}
+}
diff --git a/src/View/PartialTrait.php b/src/View/PartialTrait.php
@@ -1,13 +1,23 @@
 <?php
+declare(strict_types=1);
 
 namespace Partial\View;
 
 use Cake\View\Exception\MissingElementException;
 
-trait PartialTrait {
-    public $partialCache = 'partial';
+trait PartialTrait
+{
+    public string $partialCache = 'partial';
 
-    public function partial($name, array $data = array(), array $options = array()) {
+    /**
+     * @param string $name
+     * @param array $data
+     * @param array $options
+     * @return array|string
+     * @throws \Cake\View\Exception\MissingElementException
+     */
+    public function partial(string $name, array $data = [], array $options = []): array|string
+    {
         $file = $plugin = null;
 
         if (!isset($options['callbacks'])) {
@@ -27,21 +37,20 @@ public function partial($name, array $data = array(), array $options = array())
         }
 
         if (empty($options['ignoreMissing'])) {
-            list ($plugin, $name) = pluginSplit($name, true);
+            [$plugin, $name] = $this->pluginSplit($name, true);
             $name = str_replace('/', DS, $name);
             $file = $plugin . $this->templatePath . DS . '_' . $name . $this->_ext;
             throw new MissingElementException($file);
         }
     }
 
     /**
-     * ファイル名を取得する
-     *
-     * @access private
-     * @author sakuragawa
+     * @param string $name
+     * @return string|bool
      */
-    protected function _getPartialFileName($name) {
-        list($plugin, $name) = $this->pluginSplit($name);
+    protected function _getPartialFileName(string $name): string|bool
+    {
+        [$plugin, $name] = $this->pluginSplit($name);
 
         $paths = $this->_paths($plugin);
 
@@ -55,6 +64,7 @@ protected function _getPartialFileName($name) {
                 return $path . $this->getTemplatePath() . DS . $name . $this->_ext;
             }
         }
+
         return false;
     }
 }