PSR-4

thephpleague · Apr 10, 2014 · cf655b3 · cf655b3
1 parent c902e94
commit cf655b3
Show file tree

Hide file tree

Showing 33 changed files with 3 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,18 +4,9 @@ php:
   - 5.3
   - 5.4
   - 5.5
-
-env:
-  - SYMFONY_VERSION="2.1" GUZZLE_VERSION="3.1"
-  - SYMFONY_VERSION="2.*" GUZZLE_VERSION="3.1"
-  - SYMFONY_VERSION="2.1" GUZZLE_VERSION="3.*"
-  - SYMFONY_VERSION="2.*" GUZZLE_VERSION="3.*"
+  - hhvm
 
 before_script:
-  - composer self-update
-  - composer --version
-  - composer require symfony/http-foundation:${SYMFONY_VERSION} --no-update
-  - composer require guzzle/http:${GUZZLE_VERSION} --no-update
   - composer install -n --dev --prefer-source
 
 script: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpunit --coverage-text
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         }
     ],
     "autoload": {
-        "psr-0": { "Omnipay\\SagePay\\" : "src/" }
+        "psr-4": { "Omnipay\\SagePay\\" : "src/" }
     },
     "require": {
         "omnipay/common": "~2.0"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

diff --git a/src/Omnipay/SagePay/DirectGateway.php → src/DirectGateway.php b/src/Omnipay/SagePay/DirectGateway.php → src/DirectGateway.php
diff --git a/...nipay/SagePay/Message/AbstractRequest.php → src/Message/AbstractRequest.php b/...nipay/SagePay/Message/AbstractRequest.php → src/Message/AbstractRequest.php
diff --git a/...mnipay/SagePay/Message/CaptureRequest.php → src/Message/CaptureRequest.php b/...mnipay/SagePay/Message/CaptureRequest.php → src/Message/CaptureRequest.php
diff --git a/...agePay/Message/DirectAuthorizeRequest.php → src/Message/DirectAuthorizeRequest.php b/...agePay/Message/DirectAuthorizeRequest.php → src/Message/DirectAuthorizeRequest.php
diff --git a/...essage/DirectCompleteAuthorizeRequest.php → ...essage/DirectCompleteAuthorizeRequest.php b/...essage/DirectCompleteAuthorizeRequest.php → ...essage/DirectCompleteAuthorizeRequest.php
diff --git a/...SagePay/Message/DirectPurchaseRequest.php → src/Message/DirectPurchaseRequest.php b/...SagePay/Message/DirectPurchaseRequest.php → src/Message/DirectPurchaseRequest.php
diff --git a/...Omnipay/SagePay/Message/RefundRequest.php → src/Message/RefundRequest.php b/...Omnipay/SagePay/Message/RefundRequest.php → src/Message/RefundRequest.php
diff --git a/src/Omnipay/SagePay/Message/Response.php → src/Message/Response.php b/src/Omnipay/SagePay/Message/Response.php → src/Message/Response.php
diff --git a/...agePay/Message/ServerAuthorizeRequest.php → src/Message/ServerAuthorizeRequest.php b/...agePay/Message/ServerAuthorizeRequest.php → src/Message/ServerAuthorizeRequest.php
diff --git a/...gePay/Message/ServerAuthorizeResponse.php → src/Message/ServerAuthorizeResponse.php b/...gePay/Message/ServerAuthorizeResponse.php → src/Message/ServerAuthorizeResponse.php
diff --git a/...essage/ServerCompleteAuthorizeRequest.php → ...essage/ServerCompleteAuthorizeRequest.php b/...essage/ServerCompleteAuthorizeRequest.php → ...essage/ServerCompleteAuthorizeRequest.php
diff --git a/...ssage/ServerCompleteAuthorizeResponse.php → ...ssage/ServerCompleteAuthorizeResponse.php b/...ssage/ServerCompleteAuthorizeResponse.php → ...ssage/ServerCompleteAuthorizeResponse.php
diff --git a/...SagePay/Message/ServerPurchaseRequest.php → src/Message/ServerPurchaseRequest.php b/...SagePay/Message/ServerPurchaseRequest.php → src/Message/ServerPurchaseRequest.php
diff --git a/src/Omnipay/SagePay/ServerGateway.php → src/ServerGateway.php b/src/Omnipay/SagePay/ServerGateway.php → src/ServerGateway.php
diff --git a/tests/Omnipay/SagePay/DirectGatewayTest.php → tests/DirectGatewayTest.php b/tests/Omnipay/SagePay/DirectGatewayTest.php → tests/DirectGatewayTest.php
diff --git a/...ay/Message/DirectAuthorizeRequestTest.php → tests/Message/DirectAuthorizeRequestTest.php b/...ay/Message/DirectAuthorizeRequestTest.php → tests/Message/DirectAuthorizeRequestTest.php
diff --git a/...pay/SagePay/Message/RefundRequestTest.php → tests/Message/RefundRequestTest.php b/...pay/SagePay/Message/RefundRequestTest.php → tests/Message/RefundRequestTest.php
diff --git a/.../Omnipay/SagePay/Message/ResponseTest.php → tests/Message/ResponseTest.php b/.../Omnipay/SagePay/Message/ResponseTest.php → tests/Message/ResponseTest.php
diff --git a/...ay/Message/ServerAuthorizeRequestTest.php → tests/Message/ServerAuthorizeRequestTest.php b/...ay/Message/ServerAuthorizeRequestTest.php → tests/Message/ServerAuthorizeRequestTest.php
diff --git a/...y/Message/ServerAuthorizeResponseTest.php → ...s/Message/ServerAuthorizeResponseTest.php b/...y/Message/ServerAuthorizeResponseTest.php → ...s/Message/ServerAuthorizeResponseTest.php
diff --git a/...e/ServerCompleteAuthorizeResponseTest.php → ...e/ServerCompleteAuthorizeResponseTest.php b/...e/ServerCompleteAuthorizeResponseTest.php → ...e/ServerCompleteAuthorizeResponseTest.php
diff --git a/...s/Omnipay/SagePay/Mock/CaptureFailure.txt → tests/Mock/CaptureFailure.txt b/...s/Omnipay/SagePay/Mock/CaptureFailure.txt → tests/Mock/CaptureFailure.txt
diff --git a/...s/Omnipay/SagePay/Mock/CaptureSuccess.txt → tests/Mock/CaptureSuccess.txt b/...s/Omnipay/SagePay/Mock/CaptureSuccess.txt → tests/Mock/CaptureSuccess.txt
diff --git a/...y/SagePay/Mock/DirectPurchase3dSecure.txt → tests/Mock/DirectPurchase3dSecure.txt b/...y/SagePay/Mock/DirectPurchase3dSecure.txt → tests/Mock/DirectPurchase3dSecure.txt
diff --git a/...ay/SagePay/Mock/DirectPurchaseFailure.txt → tests/Mock/DirectPurchaseFailure.txt b/...ay/SagePay/Mock/DirectPurchaseFailure.txt → tests/Mock/DirectPurchaseFailure.txt
diff --git a/...ay/SagePay/Mock/DirectPurchaseSuccess.txt → tests/Mock/DirectPurchaseSuccess.txt b/...ay/SagePay/Mock/DirectPurchaseSuccess.txt → tests/Mock/DirectPurchaseSuccess.txt
diff --git a/...ay/SagePay/Mock/ServerPurchaseFailure.txt → tests/Mock/ServerPurchaseFailure.txt b/...ay/SagePay/Mock/ServerPurchaseFailure.txt → tests/Mock/ServerPurchaseFailure.txt
diff --git a/...ay/SagePay/Mock/ServerPurchaseSuccess.txt → tests/Mock/ServerPurchaseSuccess.txt b/...ay/SagePay/Mock/ServerPurchaseSuccess.txt → tests/Mock/ServerPurchaseSuccess.txt
diff --git a/tests/Omnipay/SagePay/ServerGatewayTest.php → tests/ServerGatewayTest.php b/tests/Omnipay/SagePay/ServerGatewayTest.php → tests/ServerGatewayTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php