Merge pull request #36 from codeigniter4/develop

Composer 2 update
codeigniter4 · Mar 4, 2021 · b7c6fe4 · b7c6fe4
2 parents db3d7d7 + 113687c
commit b7c6fe4
Show file tree

Hide file tree

Showing 26 changed files with 476 additions and 2,669 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,8 @@ env:
   - STANDARD="CodeIgniter4"
   # Upload covarage to coveralls.
   - COVERALLS="1"
+  # Xdebug3 needs this.
+  - XDEBUG_MODE=coverage
 
 matrix:
     fast_finish: true
@@ -27,7 +29,11 @@ matrix:
         # aliased to a recent 7.x version
         # - php: '7.0'
         # aliased to a recent 7.x version
-        - php: '7.1'
+        # - php: '7.1'
+        - php: '7.2'
+        - php: '7.3'
+        - php: '7.4'
+        # - php: '8.0'
         # aliased to a recent hhvm version
         # - php: 'hhvm'
         # php nightly
@@ -64,4 +70,4 @@ script:
   - ./vendor/bin/phpunit --debug --filter $STANDARD
 
 after_success:
-  - if [[ "$COVERALLS" == "1" ]]; then ./vendor/bin/coveralls -v -x ./build/logs/coverage/clover/clover.xml; fi
+  - if [[ "$COVERALLS" == "1" && "$TRAVIS_PHP_VERSION" == "7.4" ]]; then ./vendor/bin/coveralls -v -x ./build/logs/coverage/clover/clover.xml; fi
diff --git a/CodeIgniter4/Sniffs/Arrays/ArrayDeclarationSniff.php b/CodeIgniter4/Sniffs/Arrays/ArrayDeclarationSniff.php
diff --git a/CodeIgniter4/Sniffs/Commenting/ClassCommentSniff.php b/CodeIgniter4/Sniffs/Commenting/ClassCommentSniff.php
@@ -30,52 +30,52 @@ class ClassCommentSniff extends FileCommentSniff
      *
      * @var array
      */
-    protected $tags = array(
-                       '@package'    => array(
-                                         'required'       => true,
-                                         'allow_multiple' => false,
-                                        ),
-                       '@subpackage' => array(
-                                         'required'       => false,
-                                         'allow_multiple' => false,
-                                        ),
-                       '@category'   => array(
-                                         'required'       => false,
-                                         'allow_multiple' => false,
-                                        ),
-                       '@author'     => array(
-                                         'required'       => false,
-                                         'allow_multiple' => true,
-                                        ),
-                       '@copyright'  => array(
-                                         'required'       => false,
-                                         'allow_multiple' => true,
-                                        ),
-                       '@license'    => array(
-                                         'required'       => false,
-                                         'allow_multiple' => false,
-                                        ),
-                       '@link'       => array(
-                                         'required'       => false,
-                                         'allow_multiple' => true,
-                                        ),
-                       '@since'      => array(
-                                         'required'       => false,
-                                         'allow_multiple' => false,
-                                        ),
-                       '@version'    => array(
-                                         'required'       => false,
-                                         'allow_multiple' => false,
-                                        ),
-                       '@see'        => array(
-                                         'required'       => false,
-                                         'allow_multiple' => true,
-                                        ),
-                       '@deprecated' => array(
-                                         'required'       => false,
-                                         'allow_multiple' => false,
-                                        ),
-                      );
+    protected $tags = [
+        '@package'    => [
+            'required'       => true,
+            'allow_multiple' => false,
+        ],
+        '@subpackage' => [
+            'required'       => false,
+            'allow_multiple' => false,
+        ],
+        '@category'   => [
+            'required'       => false,
+            'allow_multiple' => false,
+        ],
+        '@author'     => [
+            'required'       => false,
+            'allow_multiple' => true,
+        ],
+        '@copyright'  => [
+            'required'       => false,
+            'allow_multiple' => true,
+        ],
+        '@license'    => [
+            'required'       => false,
+            'allow_multiple' => false,
+        ],
+        '@link'       => [
+            'required'       => false,
+            'allow_multiple' => true,
+        ],
+        '@since'      => [
+            'required'       => false,
+            'allow_multiple' => false,
+        ],
+        '@version'    => [
+            'required'       => false,
+            'allow_multiple' => false,
+        ],
+        '@see'        => [
+            'required'       => false,
+            'allow_multiple' => true,
+        ],
+        '@deprecated' => [
+            'required'       => false,
+            'allow_multiple' => false,
+        ],
+    ];
 
 
     /**
@@ -85,10 +85,10 @@ class ClassCommentSniff extends FileCommentSniff
      */
     public function register()
     {
-        return array(
-                T_CLASS,
-                T_INTERFACE,
-               );
+        return [
+            T_CLASS,
+            T_INTERFACE,
+        ];
 
     }//end register()
 
@@ -108,7 +108,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         $tokens    = $phpcsFile->getTokens();
         $type      = strtolower($tokens[$stackPtr]['content']);
-        $errorData = array($type);
+        $errorData = [$type];
 
         $find   = Tokens::$methodPrefixes;
         $find[] = T_WHITESPACE;