Maintain | Rework bundle structure to match Symfony best practices

Author: stloyd

.gitattributes

@@ -4,5 +4,5 @@
 /Makefile export-ignore
 /phpstan.neon export-ignore
 /phpunit.xml.dist export-ignore
-/Resources/doc export-ignore
-/Tests export-ignore
+/docs export-ignore
+/tests export-ignore

.php-cs-fixer.php

@@ -34,6 +34,7 @@
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
-            ->in(__DIR__)
+            ->in(__DIR__.'/src')
+            ->in(__DIR__.'/tests')
     )
 ;

CHANGELOG.md

@@ -141,18 +141,14 @@
 
     "autoload": {
         "psr-4": {
-            "HWI\\Bundle\\OAuthBundle\\": ""
-        },
-        "exclude-from-classmap": [
-            "/Test/",
-            "/Tests/"
-        ]
+            "HWI\\Bundle\\OAuthBundle\\": "src/"
+        }
     },
 
     "autoload-dev": {
         "psr-4": {
-            "HWI\\Bundle\\OAuthBundle\\Test\\": "Test/",
-            "HWI\\Bundle\\OAuthBundle\\Tests\\": "Tests/"
+            "HWI\\Bundle\\OAuthBundle\\Test\\": "src/Test/",
+            "HWI\\Bundle\\OAuthBundle\\Tests\\": "tests/"
         }
     },
 

README.md

@@ -1,15 +1,16 @@
 parameters:
     level: 5
     paths:
-        - .
+        - src/
+        - tests/
     excludePaths:
         # Symfony <5.4 BC layer
-        - DependencyInjection/Security/Factory/OAuthFactory.php
-        - Security/Core/Authentication/Provider/OAuthProvider.php
-        - Security/Core/Exception/AccountNotLinkedException.php
-        - Security/Core/User/OAuthAwareUserProviderInterface.php
-        - Security/Http/Firewall/OAuthListener.php
-        - Tests/Security/Core/Authentication/Provider/OAuthProviderTest.php
+        - src/DependencyInjection/Security/Factory/OAuthFactory.php
+        - src/Security/Core/Authentication/Provider/OAuthProvider.php
+        - src/Security/Core/Exception/AccountNotLinkedException.php
+        - src/Security/Core/User/OAuthAwareUserProviderInterface.php
+        - src/Security/Http/Firewall/OAuthListener.php
+        - tests/Security/Core/Authentication/Provider/OAuthProviderTest.php
 
         - vendor/*
     # Symfony <5.4 BC layer

composer.json

@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./Tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
 
     <coverage>
         <include>
-            <directory>./</directory>
+            <directory>./src/</directory>
         </include>
         <exclude>
-            <directory>./Resources</directory>
-            <directory>./Tests</directory>
-            <directory>./vendor</directory>
+            <directory>./src/Resources</directory>
         </exclude>
     </coverage>
 
@@ -21,7 +19,7 @@
 
     <testsuites>
         <testsuite name="HWIOAuthBundle test suite">
-            <directory suffix="Test.php">./Tests</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>