Merge pull request #203 from alister/psr-4-ize

Move code into subdirectories and PSR-4
alexdebril · Dec 2, 2020 · 9544fc7 · 9544fc7
2 parents 2c02ab5 + 596182e
commit 9544fc7
Show file tree

Hide file tree

Showing 59 changed files with 45 additions and 41 deletions.
diff --git a/composer.json b/composer.json
@@ -29,11 +29,15 @@
         "symfony/framework-bundle": "^4.3|^5.0"
     },
     "autoload": {
-        "psr-0": {
-            "Debril\\RssAtomBundle": ""
+        "psr-4": {
+            "Debril\\RssAtomBundle\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Debril\\RssAtomBundle\\Tests\\": "tests/"
         }
     },
-    "target-dir": "Debril/RssAtomBundle",
     "config": {
         "platform": {
             "php": "7.1.27"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./tests/bootstrap.php" colors="true">
 
     <php>
-        <server name="KERNEL_DIR" value="Tests/Controller/App" />
+        <server name="KERNEL_DIR" value="tests/Controller/App" />
         <server name="KERNEL_CLASS" value="Debril\RssAtomBundle\Tests\Controller\App\AppKernel" />
     </php>
 
@@ -15,12 +15,12 @@
 
     <filter>
         <whitelist>
-            <directory>./</directory>
+            <directory>src/</directory>
             <exclude>
-                <directory>./DependencyInjection</directory>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
+                <directory>src/DependencyInjection</directory>
+                <directory>src/Resources</directory>
+                <directory>tests</directory>
+                <directory>vendor</directory>
             </exclude>
         </whitelist>
     </filter>

diff --git a/Controller/StreamController.php → src/Controller/StreamController.php b/Controller/StreamController.php → src/Controller/StreamController.php
diff --git a/DebrilRssAtomBundle.php → src/DebrilRssAtomBundle.php b/DebrilRssAtomBundle.php → src/DebrilRssAtomBundle.php
diff --git a/DependencyInjection/Configuration.php → src/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php → src/DependencyInjection/Configuration.php
diff --git a/...dencyInjection/DebrilRssAtomExtension.php → ...dencyInjection/DebrilRssAtomExtension.php b/...dencyInjection/DebrilRssAtomExtension.php → ...dencyInjection/DebrilRssAtomExtension.php
diff --git a/...on/DriverUnreachableResourceException.php → ...on/DriverUnreachableResourceException.php b/...on/DriverUnreachableResourceException.php → ...on/DriverUnreachableResourceException.php
diff --git a/Exception/FeedException.php → src/Exception/FeedException.php b/Exception/FeedException.php → src/Exception/FeedException.php
diff --git a/...edException/FeedCannotBeReadException.php → ...edException/FeedCannotBeReadException.php b/...edException/FeedCannotBeReadException.php → ...edException/FeedCannotBeReadException.php
diff --git a/.../FeedException/FeedForbiddenException.php → .../FeedException/FeedForbiddenException.php b/.../FeedException/FeedForbiddenException.php → .../FeedException/FeedForbiddenException.php
diff --git a/...n/FeedException/FeedNotFoundException.php → ...n/FeedException/FeedNotFoundException.php b/...n/FeedException/FeedNotFoundException.php → ...n/FeedException/FeedNotFoundException.php
diff --git a/...eedException/FeedNotModifiedException.php → ...eedException/FeedNotModifiedException.php b/...eedException/FeedNotModifiedException.php → ...eedException/FeedNotModifiedException.php
diff --git a/...eedException/FeedServerErrorException.php → ...eedException/FeedServerErrorException.php b/...eedException/FeedServerErrorException.php → ...eedException/FeedServerErrorException.php
diff --git a/Exception/ParserException.php → src/Exception/ParserException.php b/Exception/ParserException.php → src/Exception/ParserException.php
diff --git a/Exception/RssAtomException.php → src/Exception/RssAtomException.php b/Exception/RssAtomException.php → src/Exception/RssAtomException.php
diff --git a/Provider/FeedProviderInterface.php → src/Provider/FeedProviderInterface.php b/Provider/FeedProviderInterface.php → src/Provider/FeedProviderInterface.php
diff --git a/Provider/MockProvider.php → src/Provider/MockProvider.php b/Provider/MockProvider.php → src/Provider/MockProvider.php
diff --git a/Request/ModifiedSince.php → src/Request/ModifiedSince.php b/Request/ModifiedSince.php → src/Request/ModifiedSince.php
diff --git a/Resources/config/routing.yml → src/Resources/config/routing.yml b/Resources/config/routing.yml → src/Resources/config/routing.yml
diff --git a/Resources/config/services.yml → src/Resources/config/services.yml b/Resources/config/services.yml → src/Resources/config/services.yml
diff --git a/Resources/doc/feed-publishing.odg → src/Resources/doc/feed-publishing.odg b/Resources/doc/feed-publishing.odg → src/Resources/doc/feed-publishing.odg
diff --git a/Resources/doc/feed-publishing.png → src/Resources/doc/feed-publishing.png b/Resources/doc/feed-publishing.png → src/Resources/doc/feed-publishing.png
diff --git a/Resources/doc/feed-reading.odg → src/Resources/doc/feed-reading.odg b/Resources/doc/feed-reading.odg → src/Resources/doc/feed-reading.odg
diff --git a/Resources/doc/feed-reading.png → src/Resources/doc/feed-reading.png b/Resources/doc/feed-reading.png → src/Resources/doc/feed-reading.png
diff --git a/Resources/doc/home.md → src/Resources/doc/home.md b/Resources/doc/home.md → src/Resources/doc/home.md
diff --git a/Resources/doc/list-of-services.md → src/Resources/doc/list-of-services.md b/Resources/doc/list-of-services.md → src/Resources/doc/list-of-services.md
diff --git a/Resources/doc/migration.md → src/Resources/doc/migration.md b/Resources/doc/migration.md → src/Resources/doc/migration.md
diff --git a/Resources/sample-atom-html.xml → src/Resources/sample-atom-html.xml b/Resources/sample-atom-html.xml → src/Resources/sample-atom-html.xml
diff --git a/Resources/sample-atom-namespaced.xml → src/Resources/sample-atom-namespaced.xml b/Resources/sample-atom-namespaced.xml → src/Resources/sample-atom-namespaced.xml
diff --git a/Resources/sample-atom-summary.xml → src/Resources/sample-atom-summary.xml b/Resources/sample-atom-summary.xml → src/Resources/sample-atom-summary.xml
diff --git a/Resources/sample-atom.xml → src/Resources/sample-atom.xml b/Resources/sample-atom.xml → src/Resources/sample-atom.xml
diff --git a/Resources/sample-rdf.xml → src/Resources/sample-rdf.xml b/Resources/sample-rdf.xml → src/Resources/sample-rdf.xml
diff --git a/Resources/sample-rss-content.xml → src/Resources/sample-rss-content.xml b/Resources/sample-rss-content.xml → src/Resources/sample-rss-content.xml
diff --git a/Resources/sample-rss-creator.xml → src/Resources/sample-rss-creator.xml b/Resources/sample-rss-creator.xml → src/Resources/sample-rss-creator.xml
diff --git a/Resources/sample-rss-media.xml → src/Resources/sample-rss-media.xml b/Resources/sample-rss-media.xml → src/Resources/sample-rss-media.xml
diff --git a/Resources/sample-rss-nodate.xml → src/Resources/sample-rss-nodate.xml b/Resources/sample-rss-nodate.xml → src/Resources/sample-rss-nodate.xml
diff --git a/Resources/sample-rss-pubdate.xml → src/Resources/sample-rss-pubdate.xml b/Resources/sample-rss-pubdate.xml → src/Resources/sample-rss-pubdate.xml
diff --git a/Resources/sample-rss.xml → src/Resources/sample-rss.xml b/Resources/sample-rss.xml → src/Resources/sample-rss.xml
diff --git a/Resources/sample/Provider.php → src/Resources/sample/Provider.php b/Resources/sample/Provider.php → src/Resources/sample/Provider.php
diff --git a/Resources/tests/curl-200-headers.txt → src/Resources/tests/curl-200-headers.txt b/Resources/tests/curl-200-headers.txt → src/Resources/tests/curl-200-headers.txt
diff --git a/Resources/tests/curl-200.txt → src/Resources/tests/curl-200.txt b/Resources/tests/curl-200.txt → src/Resources/tests/curl-200.txt
@@ -1,12 +1,12 @@
-HTTP/1.1 200 OK
-Date: Thu, 07 Feb 2013 20:29:48 GMT
-Server: Apache/2.2.22 (Linux/SUSE)
-Last-Modified: Thu, 07 Feb 2013 00:47:27 GMT
-ETag: "6422c0-427-4d517c96a65c0"
-Accept-Ranges: bytes
-Content-Length: 1063
-Content-Type: text/xml
-
+HTTP/1.1 200 OK
+Date: Thu, 07 Feb 2013 20:29:48 GMT
+Server: Apache/2.2.22 (Linux/SUSE)
+Last-Modified: Thu, 07 Feb 2013 00:47:27 GMT
+ETag: "6422c0-427-4d517c96a65c0"
+Accept-Ranges: bytes
+Content-Length: 1063
+Content-Type: text/xml
+
 <?xml version="1.0" encoding="utf-8"?>
 
 <feed xmlns="http://www.w3.org/2005/Atom">

diff --git a/Resources/tests/curl-304.txt → src/Resources/tests/curl-304.txt b/Resources/tests/curl-304.txt → src/Resources/tests/curl-304.txt
@@ -1,4 +1,4 @@
-HTTP/1.1 304 Not Modified
-Date: Thu, 07 Feb 2013 19:19:34 GMT
-Server: GSE
-
+HTTP/1.1 304 Not Modified
+Date: Thu, 07 Feb 2013 19:19:34 GMT
+Server: GSE
+
diff --git a/Resources/tests/curl-404.txt → src/Resources/tests/curl-404.txt b/Resources/tests/curl-404.txt → src/Resources/tests/curl-404.txt
@@ -1,12 +1,12 @@
-HTTP/1.1 404 Not Found
-Date: Thu, 07 Feb 2013 20:26:36 GMT
-Server: Apache/2.2.22 (Linux/SUSE)
-Vary: accept-language,accept-charset
-Accept-Ranges: bytes
-Transfer-Encoding: chunked
-Content-Type: text/html; charset=iso-8859-1
-Content-Language: en
-
+HTTP/1.1 404 Not Found
+Date: Thu, 07 Feb 2013 20:26:36 GMT
+Server: Apache/2.2.22 (Linux/SUSE)
+Vary: accept-language,accept-charset
+Accept-Ranges: bytes
+Transfer-Encoding: chunked
+Content-Type: text/html; charset=iso-8859-1
+Content-Language: en
+
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

diff --git a/Resources/tests/curl-hit.txt → src/Resources/tests/curl-hit.txt b/Resources/tests/curl-hit.txt → src/Resources/tests/curl-hit.txt
@@ -1,12 +1,12 @@
-HTTP/1.1 200 OK
-Date: Fri, 08 Feb 2013 23:16:34 GMT
-Server: Apache/2.2.22 (Linux/SUSE)
-Last-Modified: Thu, 07 Feb 2013 00:47:27 GMT
-ETag: "6422c0-427-4d517c96a65c0"
-Accept-Ranges: bytes
-Content-Length: 1063
-Content-Type: text/xml
-
+HTTP/1.1 200 OK
+Date: Fri, 08 Feb 2013 23:16:34 GMT
+Server: Apache/2.2.22 (Linux/SUSE)
+Last-Modified: Thu, 07 Feb 2013 00:47:27 GMT
+ETag: "6422c0-427-4d517c96a65c0"
+Accept-Ranges: bytes
+Content-Length: 1063
+Content-Type: text/xml
+
 <?xml version="1.0" encoding="utf-8"?>
 
 <feed xmlns="http://www.w3.org/2005/Atom">

diff --git a/Resources/truncated-atom.xml → src/Resources/truncated-atom.xml b/Resources/truncated-atom.xml → src/Resources/truncated-atom.xml
diff --git a/Resources/truncated-rss.xml → src/Resources/truncated-rss.xml b/Resources/truncated-rss.xml → src/Resources/truncated-rss.xml
diff --git a/Response/FeedBuilder.php → src/Response/FeedBuilder.php b/Response/FeedBuilder.php → src/Response/FeedBuilder.php
diff --git a/Response/HeadersBuilder.php → src/Response/HeadersBuilder.php b/Response/HeadersBuilder.php → src/Response/HeadersBuilder.php
diff --git a/Tests/Controller/App/AppKernel.php → tests/Controller/App/AppKernel.php b/Tests/Controller/App/AppKernel.php → tests/Controller/App/AppKernel.php
diff --git a/Tests/Controller/App/config.yml → tests/Controller/App/config.yml b/Tests/Controller/App/config.yml → tests/Controller/App/config.yml
diff --git a/Tests/Controller/App/routing.xml → tests/Controller/App/routing.xml b/Tests/Controller/App/routing.xml → tests/Controller/App/routing.xml
diff --git a/Tests/Controller/App/routing.yml → tests/Controller/App/routing.yml b/Tests/Controller/App/routing.yml → tests/Controller/App/routing.yml
diff --git a/Tests/Controller/StreamControllerTest.php → tests/Controller/StreamControllerTest.php b/Tests/Controller/StreamControllerTest.php → tests/Controller/StreamControllerTest.php
diff --git a/...DependencyInjection/ConfigurationTest.php → ...DependencyInjection/ConfigurationTest.php b/...DependencyInjection/ConfigurationTest.php → ...DependencyInjection/ConfigurationTest.php
diff --git a/Tests/Provider/MockProviderTest.php → tests/Provider/MockProviderTest.php b/Tests/Provider/MockProviderTest.php → tests/Provider/MockProviderTest.php
diff --git a/Tests/Request/ModifiedSinceTest.php → tests/Request/ModifiedSinceTest.php b/Tests/Request/ModifiedSinceTest.php → tests/Request/ModifiedSinceTest.php
diff --git a/Tests/Response/FeedBuilderTest.php → tests/Response/FeedBuilderTest.php b/Tests/Response/FeedBuilderTest.php → tests/Response/FeedBuilderTest.php
diff --git a/Tests/Response/HeadersBuilderTest.php → tests/Response/HeadersBuilderTest.php b/Tests/Response/HeadersBuilderTest.php → tests/Response/HeadersBuilderTest.php
diff --git a/Tests/bootstrap.php → tests/bootstrap.php b/Tests/bootstrap.php → tests/bootstrap.php