Skip to content

Commit 9544fc7

Browse files
authored
Merge pull request #203 from alister/psr-4-ize
Move code into subdirectories and PSR-4
2 parents 2c02ab5 + 596182e commit 9544fc7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+45
-41
lines changed

composer.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,15 @@
2929
"symfony/framework-bundle": "^4.3|^5.0"
3030
},
3131
"autoload": {
32-
"psr-0": {
33-
"Debril\\RssAtomBundle": ""
32+
"psr-4": {
33+
"Debril\\RssAtomBundle\\": "src/"
34+
}
35+
},
36+
"autoload-dev": {
37+
"psr-4": {
38+
"Debril\\RssAtomBundle\\Tests\\": "tests/"
3439
}
3540
},
36-
"target-dir": "Debril/RssAtomBundle",
3741
"config": {
3842
"platform": {
3943
"php": "7.1.27"

phpunit.xml.dist

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
3+
<phpunit bootstrap="./tests/bootstrap.php" colors="true">
44

55
<php>
6-
<server name="KERNEL_DIR" value="Tests/Controller/App" />
6+
<server name="KERNEL_DIR" value="tests/Controller/App" />
77
<server name="KERNEL_CLASS" value="Debril\RssAtomBundle\Tests\Controller\App\AppKernel" />
88
</php>
99

@@ -15,12 +15,12 @@
1515

1616
<filter>
1717
<whitelist>
18-
<directory>./</directory>
18+
<directory>src/</directory>
1919
<exclude>
20-
<directory>./DependencyInjection</directory>
21-
<directory>./Resources</directory>
22-
<directory>./Tests</directory>
23-
<directory>./vendor</directory>
20+
<directory>src/DependencyInjection</directory>
21+
<directory>src/Resources</directory>
22+
<directory>tests</directory>
23+
<directory>vendor</directory>
2424
</exclude>
2525
</whitelist>
2626
</filter>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Resources/tests/curl-200.txt src/Resources/tests/curl-200.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
HTTP/1.1 200 OK
2-
Date: Thu, 07 Feb 2013 20:29:48 GMT
3-
Server: Apache/2.2.22 (Linux/SUSE)
4-
Last-Modified: Thu, 07 Feb 2013 00:47:27 GMT
5-
ETag: "6422c0-427-4d517c96a65c0"
6-
Accept-Ranges: bytes
7-
Content-Length: 1063
8-
Content-Type: text/xml
9-
1+
HTTP/1.1 200 OK
2+
Date: Thu, 07 Feb 2013 20:29:48 GMT
3+
Server: Apache/2.2.22 (Linux/SUSE)
4+
Last-Modified: Thu, 07 Feb 2013 00:47:27 GMT
5+
ETag: "6422c0-427-4d517c96a65c0"
6+
Accept-Ranges: bytes
7+
Content-Length: 1063
8+
Content-Type: text/xml
9+
1010
<?xml version="1.0" encoding="utf-8"?>
1111

1212
<feed xmlns="http://www.w3.org/2005/Atom">
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
HTTP/1.1 304 Not Modified
2-
Date: Thu, 07 Feb 2013 19:19:34 GMT
3-
Server: GSE
4-
1+
HTTP/1.1 304 Not Modified
2+
Date: Thu, 07 Feb 2013 19:19:34 GMT
3+
Server: GSE
4+

Resources/tests/curl-404.txt src/Resources/tests/curl-404.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
HTTP/1.1 404 Not Found
2-
Date: Thu, 07 Feb 2013 20:26:36 GMT
3-
Server: Apache/2.2.22 (Linux/SUSE)
4-
Vary: accept-language,accept-charset
5-
Accept-Ranges: bytes
6-
Transfer-Encoding: chunked
7-
Content-Type: text/html; charset=iso-8859-1
8-
Content-Language: en
9-
1+
HTTP/1.1 404 Not Found
2+
Date: Thu, 07 Feb 2013 20:26:36 GMT
3+
Server: Apache/2.2.22 (Linux/SUSE)
4+
Vary: accept-language,accept-charset
5+
Accept-Ranges: bytes
6+
Transfer-Encoding: chunked
7+
Content-Type: text/html; charset=iso-8859-1
8+
Content-Language: en
9+
1010
<?xml version="1.0" encoding="ISO-8859-1"?>
1111
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
1212
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

Resources/tests/curl-hit.txt src/Resources/tests/curl-hit.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
HTTP/1.1 200 OK
2-
Date: Fri, 08 Feb 2013 23:16:34 GMT
3-
Server: Apache/2.2.22 (Linux/SUSE)
4-
Last-Modified: Thu, 07 Feb 2013 00:47:27 GMT
5-
ETag: "6422c0-427-4d517c96a65c0"
6-
Accept-Ranges: bytes
7-
Content-Length: 1063
8-
Content-Type: text/xml
9-
1+
HTTP/1.1 200 OK
2+
Date: Fri, 08 Feb 2013 23:16:34 GMT
3+
Server: Apache/2.2.22 (Linux/SUSE)
4+
Last-Modified: Thu, 07 Feb 2013 00:47:27 GMT
5+
ETag: "6422c0-427-4d517c96a65c0"
6+
Accept-Ranges: bytes
7+
Content-Length: 1063
8+
Content-Type: text/xml
9+
1010
<?xml version="1.0" encoding="utf-8"?>
1111

1212
<feed xmlns="http://www.w3.org/2005/Atom">
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)