Merge pull request #23 from wandersonwhcr/update-autoload

Change: Use PSR-4 Autoloader
checkdomain · Sep 20, 2017 · 2ad7fca · 2ad7fca
2 parents 6b270b5 + ed5651b
commit 2ad7fca
Show file tree

Hide file tree

Showing 31 changed files with 7 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,8 @@ php:
   - 7.0
   - 7.1
 
-script:
-  - phpunit tests/
-
 install:
   - composer install
+
+script:
+  - php vendor/bin/phpunit
diff --git a/README.md b/README.md
@@ -59,4 +59,4 @@ If you need to know all holidays for a specific country you can instantiate one
 
 ## Running Tests
 
-Run a `php composer.phar install` command in the base directory to install the `phpunit` dependency. After that you can simply call `vendor/bin/phpunit tests/` to run the test suite.
+Run a `php composer.phar install` command in the base directory to install the `phpunit` dependency. After that you can simply call `php vendor/bin/phpunit` to run the test suite.
diff --git a/composer.json b/composer.json
@@ -19,9 +19,9 @@
         "phpunit/phpunit": "~4.0"
     },
     "autoload": {
-        "psr-0": { "Checkdomain\\Holiday": "lib/" }
+        "psr-4": { "Checkdomain\\Holiday\\": "src/" }
     },
     "autoload-dev": {
-        "psr-0": { "Checkdomain\\Holiday": "tests/" }
+        "psr-4": { "Checkdomain\\Holiday\\": "test/" }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -15,18 +15,8 @@
 
     <testsuites>
         <testsuite name="Checkdomain Holidays Test Suite">
-            <directory>./tests</directory>
+            <directory>./test</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
 </phpunit>
diff --git a/lib/Checkdomain/Holiday/Model/Holiday.php → src/Model/Holiday.php b/lib/Checkdomain/Holiday/Model/Holiday.php → src/Model/Holiday.php
diff --git a/lib/Checkdomain/Holiday/Provider/AT.php → src/Provider/AT.php b/lib/Checkdomain/Holiday/Provider/AT.php → src/Provider/AT.php
diff --git a/...omain/Holiday/Provider/AbstractEaster.php → src/Provider/AbstractEaster.php b/...omain/Holiday/Provider/AbstractEaster.php → src/Provider/AbstractEaster.php
diff --git a/...ain/Holiday/Provider/AbstractProvider.php → src/Provider/AbstractProvider.php b/...ain/Holiday/Provider/AbstractProvider.php → src/Provider/AbstractProvider.php
diff --git a/lib/Checkdomain/Holiday/Provider/BR.php → src/Provider/BR.php b/lib/Checkdomain/Holiday/Provider/BR.php → src/Provider/BR.php
diff --git a/lib/Checkdomain/Holiday/Provider/DE.php → src/Provider/DE.php b/lib/Checkdomain/Holiday/Provider/DE.php → src/Provider/DE.php
diff --git a/lib/Checkdomain/Holiday/Provider/DK.php → src/Provider/DK.php b/lib/Checkdomain/Holiday/Provider/DK.php → src/Provider/DK.php
diff --git a/lib/Checkdomain/Holiday/Provider/FR.php → src/Provider/FR.php b/lib/Checkdomain/Holiday/Provider/FR.php → src/Provider/FR.php
diff --git a/lib/Checkdomain/Holiday/Provider/IT.php → src/Provider/IT.php b/lib/Checkdomain/Holiday/Provider/IT.php → src/Provider/IT.php
diff --git a/lib/Checkdomain/Holiday/Provider/NO.php → src/Provider/NO.php b/lib/Checkdomain/Holiday/Provider/NO.php → src/Provider/NO.php
diff --git a/lib/Checkdomain/Holiday/Provider/PL.php → src/Provider/PL.php b/lib/Checkdomain/Holiday/Provider/PL.php → src/Provider/PL.php
diff --git a/lib/Checkdomain/Holiday/Provider/PT.php → src/Provider/PT.php b/lib/Checkdomain/Holiday/Provider/PT.php → src/Provider/PT.php
diff --git a/lib/Checkdomain/Holiday/Provider/SE.php → src/Provider/SE.php b/lib/Checkdomain/Holiday/Provider/SE.php → src/Provider/SE.php
diff --git a/...Checkdomain/Holiday/ProviderInterface.php → src/ProviderInterface.php b/...Checkdomain/Holiday/ProviderInterface.php → src/ProviderInterface.php
diff --git a/lib/Checkdomain/Holiday/Util.php → src/Util.php b/lib/Checkdomain/Holiday/Util.php → src/Util.php
diff --git a/...s/Checkdomain/Holiday/Provider/ATTest.php → test/Provider/ATTest.php b/...s/Checkdomain/Holiday/Provider/ATTest.php → test/Provider/ATTest.php
diff --git a/...kdomain/Holiday/Provider/AbstractTest.php → test/Provider/AbstractTest.php b/...kdomain/Holiday/Provider/AbstractTest.php → test/Provider/AbstractTest.php
diff --git a/...s/Checkdomain/Holiday/Provider/BRTest.php → test/Provider/BRTest.php b/...s/Checkdomain/Holiday/Provider/BRTest.php → test/Provider/BRTest.php
diff --git a/...s/Checkdomain/Holiday/Provider/DETest.php → test/Provider/DETest.php b/...s/Checkdomain/Holiday/Provider/DETest.php → test/Provider/DETest.php
diff --git a/...s/Checkdomain/Holiday/Provider/DKTest.php → test/Provider/DKTest.php b/...s/Checkdomain/Holiday/Provider/DKTest.php → test/Provider/DKTest.php
diff --git a/...s/Checkdomain/Holiday/Provider/FRTest.php → test/Provider/FRTest.php b/...s/Checkdomain/Holiday/Provider/FRTest.php → test/Provider/FRTest.php
diff --git a/...s/Checkdomain/Holiday/Provider/ITTest.php → test/Provider/ITTest.php b/...s/Checkdomain/Holiday/Provider/ITTest.php → test/Provider/ITTest.php
diff --git a/...s/Checkdomain/Holiday/Provider/NOTest.php → test/Provider/NOTest.php b/...s/Checkdomain/Holiday/Provider/NOTest.php → test/Provider/NOTest.php
diff --git a/...s/Checkdomain/Holiday/Provider/PLTest.php → test/Provider/PLTest.php b/...s/Checkdomain/Holiday/Provider/PLTest.php → test/Provider/PLTest.php
diff --git a/...s/Checkdomain/Holiday/Provider/PTTest.php → test/Provider/PTTest.php b/...s/Checkdomain/Holiday/Provider/PTTest.php → test/Provider/PTTest.php
diff --git a/...s/Checkdomain/Holiday/Provider/SETest.php → test/Provider/SETest.php b/...s/Checkdomain/Holiday/Provider/SETest.php → test/Provider/SETest.php
diff --git a/tests/Checkdomain/Holiday/UtilTest.php → test/UtilTest.php b/tests/Checkdomain/Holiday/UtilTest.php → test/UtilTest.php
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,4 +59,4 @@ If you need to know all holidays for a specific country you can instantiate one

		## Running Tests

		Run a `php composer.phar install` command in the base directory to install the `phpunit` dependency. After that you can simply call `vendor/bin/phpunit tests/` to run the test suite.
		Run a `php composer.phar install` command in the base directory to install the `phpunit` dependency. After that you can simply call `php vendor/bin/phpunit` to run the test suite.