Merge pull request #36 from tattersoftware/workflows

Fix workflows

.github/workflows/analyze.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
 
     runs-on: ubuntu-latest
 

composer.json

@@ -24,7 +24,7 @@
         "php": "^7.3 || ^8.0"
     },
     "require-dev": {
-        "codeigniter4/codeigniter4": "dev-develop",
+        "codeigniter4/framework": "^4.1",
         "tatter/agents": "^1.2",
         "tatter/tools": "^1.15"
     },
@@ -41,12 +41,6 @@
             "Tests\\Support\\": "tests/_support"
         }
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/codeigniter4/CodeIgniter4"
-        }
-    ],
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {

depfile.yaml

@@ -1,6 +1,6 @@
 paths:
   - ./src
-  - ./vendor/codeigniter4/codeigniter4/system
+  - ./vendor/codeigniter4/framework/system
   - ./vendor/tatter
 exclude_files:
   - '#.*test.*#i'

infection.json.dist

@@ -15,5 +15,5 @@
 	"mutators": {
 		"@default": true
 	},
-	"bootstrap": "vendor/codeigniter4/codeigniter4/system/Test/bootstrap.php"
+	"bootstrap": "vendor/codeigniter4/framework/system/Test/bootstrap.php"
 }

phpstan.neon.dist

@@ -5,7 +5,7 @@ parameters:
 		- src
 		- tests
 	bootstrapFiles:
-		- vendor/codeigniter4/codeigniter4/system/Test/bootstrap.php
+		- vendor/codeigniter4/framework/system/Test/bootstrap.php
 	excludePaths:
 		- src/Config/Routes.php
 		- src/Views/*
@@ -20,7 +20,7 @@ parameters:
 		- Tatter\Schemas\Reader\Handlers\CacheHandler
 		- Tatter\Schemas\Structures\Mergeable
 	scanDirectories:
-		- vendor/codeigniter4/codeigniter4/system/Helpers
+		- vendor/codeigniter4/framework/system/Helpers
 	dynamicConstantNames:
 		- APP_NAMESPACE
 		- CI_DEBUG

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
-		bootstrap="vendor/codeigniter4/codeigniter4/system/Test/bootstrap.php"
+		bootstrap="vendor/codeigniter4/framework/system/Test/bootstrap.php"
 		backupGlobals="false"
 		beStrictAboutCoversAnnotation="true"
 		beStrictAboutOutputDuringTests="true"
@@ -80,10 +80,10 @@
 		<const name="HOMEPATH" value="./"/>
 
 		<!-- Directory containing the Paths config file -->
-		<const name="CONFIGPATH" value="./vendor/codeigniter4/codeigniter4/app/Config/"/>
+		<const name="CONFIGPATH" value="./vendor/codeigniter4/framework/app/Config/"/>
 
 		<!-- Directory containing the front controller (index.php) -->
-		<const name="PUBLICPATH" value="./vendor/codeigniter4/codeigniter4/public/"/>
+		<const name="PUBLICPATH" value="./vendor/codeigniter4/framework/public/"/>
 
 		<!-- https://getcomposer.org/xdebug -->
 		<env name="COMPOSER_DISABLE_XDEBUG_WARN" value="1"/>

src/Structures/Mergeable.php

@@ -5,6 +5,7 @@
 use ArrayIterator;
 use Countable;
 use IteratorAggregate;
+use Traversable;
 
 class Mergeable implements Countable, IteratorAggregate
 {
@@ -83,7 +84,7 @@ public function count(): int
      *
      * @return ArrayIterator
      */
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         return new ArrayIterator($this); // @phpstan-ignore-line
     }