Move to src/ layout, add strict_types, add PHPStan to CI

.github/workflows/ci.yml

@@ -6,30 +6,24 @@ on:
   pull_request:
 
 jobs:
-  test:
+  tests:
+    name: Tests
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php: [ '8.5' ]
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+      - uses: actions/checkout@v6
+      - uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
+          php-version: '8.5'
+      - uses: ramsey/composer-install@v3
+      - run: composer phpunit
 
-      - name: Get composer cache
-        uses: actions/cache@v4
+  static-analysis:
+    name: Static Analysis
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: shivammathur/setup-php@v2
         with:
-          path: ~/.cache/composer
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
-      - name: Install dependencies
-        run: composer install --no-progress --prefer-dist --no-interaction
-
-      - name: Run PHPUnit
-        run: vendor/bin/phpunit --configuration phpunit.xml.dist
+          php-version: '8.5'
+      - uses: ramsey/composer-install@v3
+      - run: composer phpstan

composer.json

@@ -31,7 +31,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Respect\\": "library/Respect"
+            "Respect\\Data\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Respect\\Data\\": "tests/"
         }
     },
     "scripts": {

phpcs.xml.dist

@@ -11,7 +11,7 @@
     <arg value="p" />
     <arg value="s" />
 
-    <file>library/</file>
+    <file>src/</file>
     <file>tests/</file>
 
     <rule ref="Respect" />

phpstan.neon.dist

@@ -1,9 +1,9 @@
 parameters:
-  level: 1
+  level: 2
   paths:
-    - library/
+    - src/
     - tests/
   ignoreErrors:
-    - message: '/Call to an undefined static method Respect\\Data\\Collections\\(Collection|Filtered|Mix|Typed)::\w+\(\)\./'
-    - message: '/Call to an undefined method Respect\\Data\\AbstractMapper::\w+\(\)\./'
+    - message: '/Call to an undefined (static )?method Respect\\Data\\(AbstractMapper|Collections\\(Collection|Filtered|Mix|Typed))::\w+\(\)\./'
+    - message: '/Access to an undefined property Respect\\Data\\Collections\\Collection::\$\w+\./'
     - message: '/Unsafe usage of new static\(\)\./'

library/Respect/Data/AbstractMapper.php → src/AbstractMapper.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data;
 
 use Respect\Data\Collections\Collection;

library/Respect/Data/CollectionIterator.php → src/CollectionIterator.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data;
 
 use RecursiveArrayIterator;

library/Respect/Data/Collections/Collection.php → src/Collections/Collection.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 use Respect\Data\AbstractMapper;

library/Respect/Data/Collections/Filterable.php → src/Collections/Filterable.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 interface Filterable

library/Respect/Data/Collections/Filtered.php → src/Collections/Filtered.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class Filtered extends Collection

library/Respect/Data/Collections/Mix.php → src/Collections/Mix.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class Mix extends Collection

library/Respect/Data/Collections/Mixable.php → src/Collections/Mixable.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 interface Mixable

library/Respect/Data/Collections/Typable.php → src/Collections/Typable.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 interface Typable

library/Respect/Data/Collections/Typed.php → src/Collections/Typed.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class Typed extends Collection

library/Respect/Data/Styles/AbstractStyle.php → src/Styles/AbstractStyle.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 abstract class AbstractStyle implements Stylable

library/Respect/Data/Styles/CakePHP.php → src/Styles/CakePHP.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 class CakePHP extends Standard

library/Respect/Data/Styles/NorthWind.php → src/Styles/NorthWind.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 class NorthWind extends Standard

library/Respect/Data/Styles/Plural.php → src/Styles/Plural.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 /**

library/Respect/Data/Styles/Sakila.php → src/Styles/Sakila.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 class Sakila extends Standard

library/Respect/Data/Styles/Standard.php → src/Styles/Standard.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 class Standard extends AbstractStyle

library/Respect/Data/Styles/Stylable.php → src/Styles/Stylable.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 interface Stylable

tests/library/Respect/Data/AbstractMapperTest.php → tests/AbstractMapperTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data;
 
 use Respect\Data\Collections\Collection;

tests/library/Respect/Data/CollectionIteratorTest.php → tests/CollectionIteratorTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data;
 
 use Respect\Data\Collections\Collection;

tests/library/Respect/Data/Collections/CollectionTest.php → tests/Collections/CollectionTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class CollectionTest extends \PHPUnit\Framework\TestCase

tests/library/Respect/Data/Collections/FilteredTest.php → tests/Collections/FilteredTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class FilteredTest extends \PHPUnit\Framework\TestCase

tests/library/Respect/Data/Collections/MixedTest.php → tests/Collections/MixedTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class MixedTest extends \PHPUnit\Framework\TestCase

tests/library/Respect/Data/Collections/TypedTest.php → tests/Collections/TypedTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class TypedTest extends \PHPUnit\Framework\TestCase