Merge pull request #178 from FriendsOfCake/json-api-lib

Replace "neomerx/json-api" with "laravel-json-api/neomerx-json-api".

.github/workflows/ci.yml

@@ -18,19 +18,17 @@ jobs:
         db-type: [ mysql ]
         prefer-lowest: ['']
         include:
-          - php-version: '7.2'
+          - php-version: '7.4'
             db-type: 'mysql'
             prefer-lowest: 'prefer-lowest'
 
     steps:
 
-      - name: Setup MySQL latest
-        if: matrix.db-type == 'mysql' && matrix.php-version != '7.2'
-        run: docker run --rm --name=mysqld -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=cakephp -p 3306:3306 -d mysql --default-authentication-plugin=mysql_native_password --disable-log-bin
-
-      - name: Setup MySQL 5.6
-        if: matrix.db-type == 'mysql' && matrix.php-version == '7.2'
-        run: docker run --rm --name=mysqld -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=cakephp -p 3306:3306 -d mysql:5.6 --character-set-server=utf8
+      - name: Setup MySQL
+        if: matrix.db-type == 'mysql'
+        run: |
+          sudo service mysql start
+          mysql -h 127.0.0.1 -u root -proot -e 'CREATE DATABASE cakephp;'
 
       - uses: actions/checkout@v3
 

composer.json

@@ -28,16 +28,16 @@
             "homepage":"https://github.com/dakota"
         }
     ],
-    "require":{
-        "php": ">=7.2.0",
-        "cakephp/cakephp": "^4.0.2",
+    "require": {
+        "php": ">=7.4.0",
+        "cakephp/cakephp": "^4.4.1",
         "friendsofcake/crud": "^6.0",
-        "neomerx/json-api": "^4.0"
+        "laravel-json-api/neomerx-json-api": "^5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~8.5 || ^9.3",
         "friendsofcake/cakephp-test-utilities": "^2.0.1",
-        "friendsofcake/search": "^6.0.0",
+        "friendsofcake/search": "^6.2.2",
         "cakephp/cakephp-codesniffer": "^4.0",
         "dms/phpunit-arraysubset-asserts": "^0.4.0"
     },

phpstan.neon

@@ -6,6 +6,7 @@ parameters:
 	paths:
 		- src
 	checkMissingIterableValueType: false
+	checkGenericClassInNonGenericObjectType: false
 	universalObjectCratesClasses:
 		- Crud\Event\Subject
 	bootstrapFiles: