From 2aa8e8da1bb3396d06fa92af5c13d26f0958a134 Mon Sep 17 00:00:00 2001
From: Alexandre Gomes Gaigalas <alganet@gmail.com>
Date: Sat, 14 Mar 2026 21:57:34 -0300
Subject: [PATCH] Move to src/ layout, add strict_types, add PHPStan to CI

- Move source from library/Respect/Data/ to src/ and tests from
  tests/library/Respect/Data/ to tests/. Update PSR-4 autoload
  to Respect\Data\ -> src/ with autoload-dev for tests.
- Add declare(strict_types=1) to all 22 PHP files.
- Raise PHPStan to level 2 with ignores for magic method and
  property access patterns.
- Modernize CI: split into tests and static-analysis jobs,
  update to actions/checkout@v6 and ramsey/composer-install@v3.
---
 .github/workflows/ci.yml                      | 38 ++++++++-----------
 composer.json                                 |  7 +++-
 phpcs.xml.dist                                |  2 +-
 phpstan.neon.dist                             |  8 ++--
 .../Respect/Data => src}/AbstractMapper.php   |  2 +
 .../Data => src}/CollectionIterator.php       |  2 +
 .../Data => src}/Collections/Collection.php   |  2 +
 .../Data => src}/Collections/Filterable.php   |  2 +
 .../Data => src}/Collections/Filtered.php     |  2 +
 .../Respect/Data => src}/Collections/Mix.php  |  2 +
 .../Data => src}/Collections/Mixable.php      |  2 +
 .../Data => src}/Collections/Typable.php      |  2 +
 .../Data => src}/Collections/Typed.php        |  2 +
 .../Data => src}/Styles/AbstractStyle.php     |  2 +
 .../Respect/Data => src}/Styles/CakePHP.php   |  2 +
 .../Respect/Data => src}/Styles/NorthWind.php |  2 +
 .../Respect/Data => src}/Styles/Plural.php    |  2 +
 .../Respect/Data => src}/Styles/Sakila.php    |  2 +
 .../Respect/Data => src}/Styles/Standard.php  |  2 +
 .../Respect/Data => src}/Styles/Stylable.php  |  2 +
 .../Respect/Data => }/AbstractMapperTest.php  |  2 +
 .../Data => }/CollectionIteratorTest.php      |  2 +
 .../Data => }/Collections/CollectionTest.php  |  2 +
 .../Data => }/Collections/FilteredTest.php    |  2 +
 .../Data => }/Collections/MixedTest.php       |  2 +
 .../Data => }/Collections/TypedTest.php       |  2 +
 26 files changed, 71 insertions(+), 28 deletions(-)
 rename {library/Respect/Data => src}/AbstractMapper.php (99%)
 rename {library/Respect/Data => src}/CollectionIterator.php (97%)
 rename {library/Respect/Data => src}/Collections/Collection.php (99%)
 rename {library/Respect/Data => src}/Collections/Filterable.php (87%)
 rename {library/Respect/Data => src}/Collections/Filtered.php (94%)
 rename {library/Respect/Data => src}/Collections/Mix.php (94%)
 rename {library/Respect/Data => src}/Collections/Mixable.php (87%)
 rename {library/Respect/Data => src}/Collections/Typable.php (86%)
 rename {library/Respect/Data => src}/Collections/Typed.php (94%)
 rename {library/Respect/Data => src}/Styles/AbstractStyle.php (97%)
 rename {library/Respect/Data => src}/Styles/CakePHP.php (97%)
 rename {library/Respect/Data => src}/Styles/NorthWind.php (97%)
 rename {library/Respect/Data => src}/Styles/Plural.php (98%)
 rename {library/Respect/Data => src}/Styles/Sakila.php (86%)
 rename {library/Respect/Data => src}/Styles/Standard.php (97%)
 rename {library/Respect/Data => src}/Styles/Stylable.php (94%)
 rename tests/{library/Respect/Data => }/AbstractMapperTest.php (98%)
 rename tests/{library/Respect/Data => }/CollectionIteratorTest.php (98%)
 rename tests/{library/Respect/Data => }/Collections/CollectionTest.php (99%)
 rename tests/{library/Respect/Data => }/Collections/FilteredTest.php (97%)
 rename tests/{library/Respect/Data => }/Collections/MixedTest.php (97%)
 rename tests/{library/Respect/Data => }/Collections/TypedTest.php (97%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 757d47a..c02b873 100644
--- a/.github/workflows/ci.yml
+++ b/.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
\ No newline at end of file
+          php-version: '8.5'
+      - uses: ramsey/composer-install@v3
+      - run: composer phpstan
diff --git a/composer.json b/composer.json
index 0e683fc..4d996e7 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Respect\\": "library/Respect"
+            "Respect\\Data\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Respect\\Data\\": "tests/"
         }
     },
     "scripts": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index e46b5b1..923dc83 100644
--- a/phpcs.xml.dist
+++ b/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" />
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 863cf16..b3f480f 100644
--- a/phpstan.neon.dist
+++ b/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\(\)\./'
diff --git a/library/Respect/Data/AbstractMapper.php b/src/AbstractMapper.php
similarity index 99%
rename from library/Respect/Data/AbstractMapper.php
rename to src/AbstractMapper.php
index 0531be4..1ea036e 100644
--- a/library/Respect/Data/AbstractMapper.php
+++ b/src/AbstractMapper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data;
 
 use Respect\Data\Collections\Collection;
diff --git a/library/Respect/Data/CollectionIterator.php b/src/CollectionIterator.php
similarity index 97%
rename from library/Respect/Data/CollectionIterator.php
rename to src/CollectionIterator.php
index e1fe6d3..026c0a3 100644
--- a/library/Respect/Data/CollectionIterator.php
+++ b/src/CollectionIterator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data;
 
 use RecursiveArrayIterator;
diff --git a/library/Respect/Data/Collections/Collection.php b/src/Collections/Collection.php
similarity index 99%
rename from library/Respect/Data/Collections/Collection.php
rename to src/Collections/Collection.php
index 546bbd8..70e3037 100644
--- a/library/Respect/Data/Collections/Collection.php
+++ b/src/Collections/Collection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 use Respect\Data\AbstractMapper;
diff --git a/library/Respect/Data/Collections/Filterable.php b/src/Collections/Filterable.php
similarity index 87%
rename from library/Respect/Data/Collections/Filterable.php
rename to src/Collections/Filterable.php
index 1556250..59806e9 100644
--- a/library/Respect/Data/Collections/Filterable.php
+++ b/src/Collections/Filterable.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 interface Filterable
diff --git a/library/Respect/Data/Collections/Filtered.php b/src/Collections/Filtered.php
similarity index 94%
rename from library/Respect/Data/Collections/Filtered.php
rename to src/Collections/Filtered.php
index 4385537..db3302d 100644
--- a/library/Respect/Data/Collections/Filtered.php
+++ b/src/Collections/Filtered.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class Filtered extends Collection
diff --git a/library/Respect/Data/Collections/Mix.php b/src/Collections/Mix.php
similarity index 94%
rename from library/Respect/Data/Collections/Mix.php
rename to src/Collections/Mix.php
index 8f47c85..9fbf5fd 100644
--- a/library/Respect/Data/Collections/Mix.php
+++ b/src/Collections/Mix.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class Mix extends Collection
diff --git a/library/Respect/Data/Collections/Mixable.php b/src/Collections/Mixable.php
similarity index 87%
rename from library/Respect/Data/Collections/Mixable.php
rename to src/Collections/Mixable.php
index 0fa7728..0139a4d 100644
--- a/library/Respect/Data/Collections/Mixable.php
+++ b/src/Collections/Mixable.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 interface Mixable
diff --git a/library/Respect/Data/Collections/Typable.php b/src/Collections/Typable.php
similarity index 86%
rename from library/Respect/Data/Collections/Typable.php
rename to src/Collections/Typable.php
index bafecb9..49d9df7 100644
--- a/library/Respect/Data/Collections/Typable.php
+++ b/src/Collections/Typable.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 interface Typable
diff --git a/library/Respect/Data/Collections/Typed.php b/src/Collections/Typed.php
similarity index 94%
rename from library/Respect/Data/Collections/Typed.php
rename to src/Collections/Typed.php
index c246c2c..943a5d5 100644
--- a/library/Respect/Data/Collections/Typed.php
+++ b/src/Collections/Typed.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class Typed extends Collection
diff --git a/library/Respect/Data/Styles/AbstractStyle.php b/src/Styles/AbstractStyle.php
similarity index 97%
rename from library/Respect/Data/Styles/AbstractStyle.php
rename to src/Styles/AbstractStyle.php
index 8577e24..5af25d3 100644
--- a/library/Respect/Data/Styles/AbstractStyle.php
+++ b/src/Styles/AbstractStyle.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 abstract class AbstractStyle implements Stylable
diff --git a/library/Respect/Data/Styles/CakePHP.php b/src/Styles/CakePHP.php
similarity index 97%
rename from library/Respect/Data/Styles/CakePHP.php
rename to src/Styles/CakePHP.php
index 4f03095..7a6566d 100644
--- a/library/Respect/Data/Styles/CakePHP.php
+++ b/src/Styles/CakePHP.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 class CakePHP extends Standard
diff --git a/library/Respect/Data/Styles/NorthWind.php b/src/Styles/NorthWind.php
similarity index 97%
rename from library/Respect/Data/Styles/NorthWind.php
rename to src/Styles/NorthWind.php
index 51251eb..ab291ee 100644
--- a/library/Respect/Data/Styles/NorthWind.php
+++ b/src/Styles/NorthWind.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 class NorthWind extends Standard
diff --git a/library/Respect/Data/Styles/Plural.php b/src/Styles/Plural.php
similarity index 98%
rename from library/Respect/Data/Styles/Plural.php
rename to src/Styles/Plural.php
index 28c36f7..d3114e1 100644
--- a/library/Respect/Data/Styles/Plural.php
+++ b/src/Styles/Plural.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 /**
diff --git a/library/Respect/Data/Styles/Sakila.php b/src/Styles/Sakila.php
similarity index 86%
rename from library/Respect/Data/Styles/Sakila.php
rename to src/Styles/Sakila.php
index f629d3e..4570fa4 100644
--- a/library/Respect/Data/Styles/Sakila.php
+++ b/src/Styles/Sakila.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 class Sakila extends Standard
diff --git a/library/Respect/Data/Styles/Standard.php b/src/Styles/Standard.php
similarity index 97%
rename from library/Respect/Data/Styles/Standard.php
rename to src/Styles/Standard.php
index e59184e..394b493 100644
--- a/library/Respect/Data/Styles/Standard.php
+++ b/src/Styles/Standard.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 class Standard extends AbstractStyle
diff --git a/library/Respect/Data/Styles/Stylable.php b/src/Styles/Stylable.php
similarity index 94%
rename from library/Respect/Data/Styles/Stylable.php
rename to src/Styles/Stylable.php
index 667b2db..aa4f74a 100644
--- a/library/Respect/Data/Styles/Stylable.php
+++ b/src/Styles/Stylable.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Styles;
 
 interface Stylable
diff --git a/tests/library/Respect/Data/AbstractMapperTest.php b/tests/AbstractMapperTest.php
similarity index 98%
rename from tests/library/Respect/Data/AbstractMapperTest.php
rename to tests/AbstractMapperTest.php
index 2aa11c6..e71a243 100644
--- a/tests/library/Respect/Data/AbstractMapperTest.php
+++ b/tests/AbstractMapperTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data;
 
 use Respect\Data\Collections\Collection;
diff --git a/tests/library/Respect/Data/CollectionIteratorTest.php b/tests/CollectionIteratorTest.php
similarity index 98%
rename from tests/library/Respect/Data/CollectionIteratorTest.php
rename to tests/CollectionIteratorTest.php
index ca99cf0..27dfd51 100644
--- a/tests/library/Respect/Data/CollectionIteratorTest.php
+++ b/tests/CollectionIteratorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data;
 
 use Respect\Data\Collections\Collection;
diff --git a/tests/library/Respect/Data/Collections/CollectionTest.php b/tests/Collections/CollectionTest.php
similarity index 99%
rename from tests/library/Respect/Data/Collections/CollectionTest.php
rename to tests/Collections/CollectionTest.php
index 8452730..9a81f02 100644
--- a/tests/library/Respect/Data/Collections/CollectionTest.php
+++ b/tests/Collections/CollectionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class CollectionTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/library/Respect/Data/Collections/FilteredTest.php b/tests/Collections/FilteredTest.php
similarity index 97%
rename from tests/library/Respect/Data/Collections/FilteredTest.php
rename to tests/Collections/FilteredTest.php
index d0a304e..d233e21 100644
--- a/tests/library/Respect/Data/Collections/FilteredTest.php
+++ b/tests/Collections/FilteredTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class FilteredTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/library/Respect/Data/Collections/MixedTest.php b/tests/Collections/MixedTest.php
similarity index 97%
rename from tests/library/Respect/Data/Collections/MixedTest.php
rename to tests/Collections/MixedTest.php
index b2c0e60..d08516b 100644
--- a/tests/library/Respect/Data/Collections/MixedTest.php
+++ b/tests/Collections/MixedTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class MixedTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/library/Respect/Data/Collections/TypedTest.php b/tests/Collections/TypedTest.php
similarity index 97%
rename from tests/library/Respect/Data/Collections/TypedTest.php
rename to tests/Collections/TypedTest.php
index f12268e..55dc217 100644
--- a/tests/library/Respect/Data/Collections/TypedTest.php
+++ b/tests/Collections/TypedTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Respect\Data\Collections;
 
 class TypedTest extends \PHPUnit\Framework\TestCase