2.2.0 readiness

zendframework · Mar 15, 2017 · 5c5bde6 · 5c5bde6
2 parents dd43112 + 1d0ab17
commit 5c5bde6
Show file tree

Hide file tree

Showing 102 changed files with 91 additions and 29 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,10 @@
+/doc export-ignore
+/test export-ignore
+/.coveralls.yml export-ignore
+/.docheader export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/mkdocs.yml export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -61,7 +61,7 @@ matrix:
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - travis_retry composer self-update
-  - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
+  - cp test/TestConfiguration.php.travis test/TestConfiguration.php
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,12 +2,18 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.1.1 - TBD
+## 2.2.0 - 2017-03-15
 
 ### Added
 
 - Nothing.
 
+### Changed
+
+- [#69](https://github.com/zendframework/ZendService_Amazon/pull/69) changed
+  folder structure to PSR-4. No action is needed if you use composer to install
+  package.
+
 ### Deprecated
 
 - Nothing.

diff --git a/composer.json b/composer.json
@@ -13,13 +13,13 @@
     "homepage": "http://packages.zendframework.com/",
     "license": "BSD-3-Clause",
     "autoload": {
-        "psr-0": {
-            "ZendService\\Amazon\\": "library/"
+        "psr-4": {
+            "ZendService\\Amazon\\": "src/"
         }
     },
     "autoload-dev": {
-        "psr-0": {
-            "ZendServiceTest\\Amazon\\": "tests/"
+        "psr-4": {
+            "ZendServiceTest\\Amazon\\": "test/"
         }
     },
     "require": {
@@ -41,8 +41,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev",
-            "dev-develop": "2.2.x-dev"
+            "dev-master": "2.2.x-dev",
+            "dev-develop": "2.3.x-dev"
         }
     },
     "scripts": {
@@ -56,6 +56,6 @@
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --coverage-clover clover.xml",
-        "license-check": "vendor/bin/docheader check library/ tests/"
+        "license-check": "vendor/bin/docheader check src/ test/"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/phpcs.xml b/phpcs.xml
@@ -3,12 +3,12 @@
     <rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml"/>
 
     <!-- Paths to check -->
-    <file>library</file>
-    <file>tests</file>
+    <file>src</file>
+    <file>test</file>
     <exclude-pattern>*/_files/*</exclude-pattern>
 
     <!-- Ignore warnings related to implementing a PHP interface -->
     <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
-        <exclude-pattern>*/Amazon/S3/Stream.php</exclude-pattern>
+        <exclude-pattern>*/S3/Stream.php</exclude-pattern>
     </rule>
 </ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,7 @@
-<phpunit bootstrap="./tests/Bootstrap.php" colors="true">
+<phpunit bootstrap="./test/Bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="ZendService Amazon Test Suite">
-            <directory>./tests/ZendServiceTest</directory>
+            <directory>./test</directory>
         </testsuite>
     </testsuites>
 
@@ -13,7 +13,7 @@
 
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./library</directory>
+            <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/...ary/ZendService/Amazon/AbstractAmazon.php → src/AbstractAmazon.php b/...ary/ZendService/Amazon/AbstractAmazon.php → src/AbstractAmazon.php
diff --git a/library/ZendService/Amazon/Accessories.php → src/Accessories.php b/library/ZendService/Amazon/Accessories.php → src/Accessories.php
diff --git a/library/ZendService/Amazon/Amazon.php → src/Amazon.php b/library/ZendService/Amazon/Amazon.php → src/Amazon.php
diff --git a/...Authentication/AbstractAuthentication.php → ...Authentication/AbstractAuthentication.php b/...Authentication/AbstractAuthentication.php → ...Authentication/AbstractAuthentication.php
diff --git a/...tication/Exception/ExceptionInterface.php → ...tication/Exception/ExceptionInterface.php b/...tication/Exception/ExceptionInterface.php → ...tication/Exception/ExceptionInterface.php
diff --git a/...on/Exception/InvalidArgumentException.php → ...on/Exception/InvalidArgumentException.php b/...on/Exception/InvalidArgumentException.php → ...on/Exception/InvalidArgumentException.php
diff --git a/...entication/Exception/RuntimeException.php → ...entication/Exception/RuntimeException.php b/...entication/Exception/RuntimeException.php → ...entication/Exception/RuntimeException.php
diff --git a/.../ZendService/Amazon/Authentication/S3.php → src/Authentication/S3.php b/.../ZendService/Amazon/Authentication/S3.php → src/Authentication/S3.php
diff --git a/.../ZendService/Amazon/Authentication/V1.php → src/Authentication/V1.php b/.../ZendService/Amazon/Authentication/V1.php → src/Authentication/V1.php
diff --git a/.../ZendService/Amazon/Authentication/V2.php → src/Authentication/V2.php b/.../ZendService/Amazon/Authentication/V2.php → src/Authentication/V2.php
diff --git a/...ary/ZendService/Amazon/CustomerReview.php → src/CustomerReview.php b/...ary/ZendService/Amazon/CustomerReview.php → src/CustomerReview.php
diff --git a/...ry/ZendService/Amazon/Ec2/AbstractEc2.php → src/Ec2/AbstractEc2.php b/...ry/ZendService/Amazon/Ec2/AbstractEc2.php → src/Ec2/AbstractEc2.php
diff --git a/...dService/Amazon/Ec2/AvailabilityZones.php → src/Ec2/AvailabilityZones.php b/...dService/Amazon/Ec2/AvailabilityZones.php → src/Ec2/AvailabilityZones.php
diff --git a/...ary/ZendService/Amazon/Ec2/CloudWatch.php → src/Ec2/CloudWatch.php b/...ary/ZendService/Amazon/Ec2/CloudWatch.php → src/Ec2/CloudWatch.php
diff --git a/library/ZendService/Amazon/Ec2/Ebs.php → src/Ec2/Ebs.php b/library/ZendService/Amazon/Ec2/Ebs.php → src/Ec2/Ebs.php
diff --git a/library/ZendService/Amazon/Ec2/Ec2.php → src/Ec2/Ec2.php b/library/ZendService/Amazon/Ec2/Ec2.php → src/Ec2/Ec2.php
diff --git a/library/ZendService/Amazon/Ec2/ElasticIp.php → src/Ec2/ElasticIp.php b/library/ZendService/Amazon/Ec2/ElasticIp.php → src/Ec2/ElasticIp.php
diff --git a/...azon/Ec2/Exception/ExceptionInterface.php → src/Ec2/Exception/ExceptionInterface.php b/...azon/Ec2/Exception/ExceptionInterface.php → src/Ec2/Exception/ExceptionInterface.php
diff --git a/...c2/Exception/InvalidArgumentException.php → ...c2/Exception/InvalidArgumentException.php b/...c2/Exception/InvalidArgumentException.php → ...c2/Exception/InvalidArgumentException.php
diff --git a/...Amazon/Ec2/Exception/RuntimeException.php → src/Ec2/Exception/RuntimeException.php b/...Amazon/Ec2/Exception/RuntimeException.php → src/Ec2/Exception/RuntimeException.php
diff --git a/library/ZendService/Amazon/Ec2/Image.php → src/Ec2/Image.php b/library/ZendService/Amazon/Ec2/Image.php → src/Ec2/Image.php
diff --git a/library/ZendService/Amazon/Ec2/Instance.php → src/Ec2/Instance.php b/library/ZendService/Amazon/Ec2/Instance.php → src/Ec2/Instance.php
diff --git a/library/ZendService/Amazon/Ec2/Keypair.php → src/Ec2/Keypair.php b/library/ZendService/Amazon/Ec2/Keypair.php → src/Ec2/Keypair.php
diff --git a/library/ZendService/Amazon/Ec2/Region.php → src/Ec2/Region.php b/library/ZendService/Amazon/Ec2/Region.php → src/Ec2/Region.php
diff --git a/...ndService/Amazon/Ec2/ReservedInstance.php → src/Ec2/ReservedInstance.php b/...ndService/Amazon/Ec2/ReservedInstance.php → src/Ec2/ReservedInstance.php
diff --git a/library/ZendService/Amazon/Ec2/Response.php → src/Ec2/Response.php b/library/ZendService/Amazon/Ec2/Response.php → src/Ec2/Response.php
diff --git a/...ZendService/Amazon/Ec2/SecurityGroups.php → src/Ec2/SecurityGroups.php b/...ZendService/Amazon/Ec2/SecurityGroups.php → src/Ec2/SecurityGroups.php
diff --git a/...endService/Amazon/Ec2/WindowsInstance.php → src/Ec2/WindowsInstance.php b/...endService/Amazon/Ec2/WindowsInstance.php → src/Ec2/WindowsInstance.php
diff --git a/...ry/ZendService/Amazon/EditorialReview.php → src/EditorialReview.php b/...ry/ZendService/Amazon/EditorialReview.php → src/EditorialReview.php
diff --git a/...e/Amazon/Exception/ExceptionInterface.php → src/Exception/ExceptionInterface.php b/...e/Amazon/Exception/ExceptionInterface.php → src/Exception/ExceptionInterface.php
diff --git a/...on/Exception/InvalidArgumentException.php → src/Exception/InvalidArgumentException.php b/...on/Exception/InvalidArgumentException.php → src/Exception/InvalidArgumentException.php
diff --git a/...Amazon/Exception/OutOfBoundsException.php → src/Exception/OutOfBoundsException.php b/...Amazon/Exception/OutOfBoundsException.php → src/Exception/OutOfBoundsException.php
diff --git a/...ice/Amazon/Exception/RuntimeException.php → src/Exception/RuntimeException.php b/...ice/Amazon/Exception/RuntimeException.php → src/Exception/RuntimeException.php
diff --git a/library/ZendService/Amazon/Image.php → src/Image.php b/library/ZendService/Amazon/Image.php → src/Image.php
diff --git a/library/ZendService/Amazon/Item.php → src/Item.php b/library/ZendService/Amazon/Item.php → src/Item.php
diff --git a/library/ZendService/Amazon/ListmaniaList.php → src/ListmaniaList.php b/library/ZendService/Amazon/ListmaniaList.php → src/ListmaniaList.php
diff --git a/library/ZendService/Amazon/Offer.php → src/Offer.php b/library/ZendService/Amazon/Offer.php → src/Offer.php
diff --git a/library/ZendService/Amazon/OfferSet.php → src/OfferSet.php b/library/ZendService/Amazon/OfferSet.php → src/OfferSet.php
diff --git a/library/ZendService/Amazon/Query.php → src/Query.php b/library/ZendService/Amazon/Query.php → src/Query.php
diff --git a/library/ZendService/Amazon/ResultSet.php → src/ResultSet.php b/library/ZendService/Amazon/ResultSet.php → src/ResultSet.php
diff --git a/...mazon/S3/Exception/ExceptionInterface.php → src/S3/Exception/ExceptionInterface.php b/...mazon/S3/Exception/ExceptionInterface.php → src/S3/Exception/ExceptionInterface.php
diff --git a/...S3/Exception/InvalidArgumentException.php → ...S3/Exception/InvalidArgumentException.php b/...S3/Exception/InvalidArgumentException.php → ...S3/Exception/InvalidArgumentException.php
diff --git a/.../Amazon/S3/Exception/RuntimeException.php → src/S3/Exception/RuntimeException.php b/.../Amazon/S3/Exception/RuntimeException.php → src/S3/Exception/RuntimeException.php
diff --git a/library/ZendService/Amazon/S3/S3.php → src/S3/S3.php b/library/ZendService/Amazon/S3/S3.php → src/S3/S3.php
diff --git a/library/ZendService/Amazon/S3/Stream.php → src/S3/Stream.php b/library/ZendService/Amazon/S3/Stream.php → src/S3/Stream.php
diff --git a/...ary/ZendService/Amazon/SimilarProduct.php → src/SimilarProduct.php b/...ary/ZendService/Amazon/SimilarProduct.php → src/SimilarProduct.php
diff --git a/...ZendService/Amazon/SimpleDb/Attribute.php → src/SimpleDb/Attribute.php b/...ZendService/Amazon/SimpleDb/Attribute.php → src/SimpleDb/Attribute.php
diff --git a/...SimpleDb/Exception/ExceptionInterface.php → ...SimpleDb/Exception/ExceptionInterface.php b/...SimpleDb/Exception/ExceptionInterface.php → ...SimpleDb/Exception/ExceptionInterface.php
diff --git a/...Db/Exception/InvalidArgumentException.php → ...Db/Exception/InvalidArgumentException.php b/...Db/Exception/InvalidArgumentException.php → ...Db/Exception/InvalidArgumentException.php
diff --git a/...n/SimpleDb/Exception/RuntimeException.php → src/SimpleDb/Exception/RuntimeException.php b/...n/SimpleDb/Exception/RuntimeException.php → src/SimpleDb/Exception/RuntimeException.php
diff --git a/library/ZendService/Amazon/SimpleDb/Page.php → src/SimpleDb/Page.php b/library/ZendService/Amazon/SimpleDb/Page.php → src/SimpleDb/Page.php
diff --git a/.../ZendService/Amazon/SimpleDb/Response.php → src/SimpleDb/Response.php b/.../ZendService/Amazon/SimpleDb/Response.php → src/SimpleDb/Response.php
diff --git a/.../ZendService/Amazon/SimpleDb/SimpleDb.php → src/SimpleDb/SimpleDb.php b/.../ZendService/Amazon/SimpleDb/SimpleDb.php → src/SimpleDb/SimpleDb.php
diff --git a/...azon/Sqs/Exception/ExceptionInterface.php → src/Sqs/Exception/ExceptionInterface.php b/...azon/Sqs/Exception/ExceptionInterface.php → src/Sqs/Exception/ExceptionInterface.php
diff --git a/...qs/Exception/InvalidArgumentException.php → ...qs/Exception/InvalidArgumentException.php b/...qs/Exception/InvalidArgumentException.php → ...qs/Exception/InvalidArgumentException.php
diff --git a/...Amazon/Sqs/Exception/RuntimeException.php → src/Sqs/Exception/RuntimeException.php b/...Amazon/Sqs/Exception/RuntimeException.php → src/Sqs/Exception/RuntimeException.php
diff --git a/library/ZendService/Amazon/Sqs/Sqs.php → src/Sqs/Sqs.php b/library/ZendService/Amazon/Sqs/Sqs.php → src/Sqs/Sqs.php
diff --git a/...viceTest/Amazon/Authentication/S3Test.php → test/Authentication/S3Test.php b/...viceTest/Amazon/Authentication/S3Test.php → test/Authentication/S3Test.php
diff --git a/...viceTest/Amazon/Authentication/V1Test.php → test/Authentication/V1Test.php b/...viceTest/Amazon/Authentication/V1Test.php → test/Authentication/V1Test.php
diff --git a/...viceTest/Amazon/Authentication/V2Test.php → test/Authentication/V2Test.php b/...viceTest/Amazon/Authentication/V2Test.php → test/Authentication/V2Test.php
diff --git a/...n/Authentication/_files/ec2_v2_return.txt → test/Authentication/_files/ec2_v2_return.txt b/...n/Authentication/_files/ec2_v2_return.txt → test/Authentication/_files/ec2_v2_return.txt
diff --git a/...thentication/_files/sqs_v2_get_return.txt → ...thentication/_files/sqs_v2_get_return.txt b/...thentication/_files/sqs_v2_get_return.txt → ...thentication/_files/sqs_v2_get_return.txt
diff --git a/tests/Bootstrap.php → test/Bootstrap.php b/tests/Bootstrap.php → test/Bootstrap.php
diff --git a/...ndServiceTest/Amazon/Ec2/AbstractTest.php → test/Ec2/AbstractTest.php b/...ndServiceTest/Amazon/Ec2/AbstractTest.php → test/Ec2/AbstractTest.php
diff --git a/...Test/Amazon/Ec2/AvailabilityZonesTest.php → test/Ec2/AvailabilityZonesTest.php b/...Test/Amazon/Ec2/AvailabilityZonesTest.php → test/Ec2/AvailabilityZonesTest.php
diff --git a/...ServiceTest/Amazon/Ec2/CloudWatchTest.php → test/Ec2/CloudWatchTest.php b/...ServiceTest/Amazon/Ec2/CloudWatchTest.php → test/Ec2/CloudWatchTest.php
diff --git a/tests/ZendServiceTest/Amazon/Ec2/EbsTest.php → test/Ec2/EbsTest.php b/tests/ZendServiceTest/Amazon/Ec2/EbsTest.php → test/Ec2/EbsTest.php
diff --git a/tests/ZendServiceTest/Amazon/Ec2/Ec2Test.php → test/Ec2/Ec2Test.php b/tests/ZendServiceTest/Amazon/Ec2/Ec2Test.php → test/Ec2/Ec2Test.php
diff --git a/...dServiceTest/Amazon/Ec2/ElasticIpTest.php → test/Ec2/ElasticIpTest.php b/...dServiceTest/Amazon/Ec2/ElasticIpTest.php → test/Ec2/ElasticIpTest.php
diff --git a/.../ZendServiceTest/Amazon/Ec2/ImageTest.php → test/Ec2/ImageTest.php b/.../ZendServiceTest/Amazon/Ec2/ImageTest.php → test/Ec2/ImageTest.php
diff --git a/...eTest/Amazon/Ec2/InstanceReservedTest.php → test/Ec2/InstanceReservedTest.php b/...eTest/Amazon/Ec2/InstanceReservedTest.php → test/Ec2/InstanceReservedTest.php
diff --git a/...ndServiceTest/Amazon/Ec2/InstanceTest.php → test/Ec2/InstanceTest.php b/...ndServiceTest/Amazon/Ec2/InstanceTest.php → test/Ec2/InstanceTest.php
diff --git a/...ceTest/Amazon/Ec2/InstanceWindowsTest.php → test/Ec2/InstanceWindowsTest.php b/...ceTest/Amazon/Ec2/InstanceWindowsTest.php → test/Ec2/InstanceWindowsTest.php
diff --git a/...endServiceTest/Amazon/Ec2/KeypairTest.php → test/Ec2/KeypairTest.php b/...endServiceTest/Amazon/Ec2/KeypairTest.php → test/Ec2/KeypairTest.php
diff --git a/...ZendServiceTest/Amazon/Ec2/RegionTest.php → test/Ec2/RegionTest.php b/...ZendServiceTest/Amazon/Ec2/RegionTest.php → test/Ec2/RegionTest.php
diff --git a/...iceTest/Amazon/Ec2/SecurityGroupsTest.php → test/Ec2/SecurityGroupsTest.php b/...iceTest/Amazon/Ec2/SecurityGroupsTest.php → test/Ec2/SecurityGroupsTest.php
diff --git a/...iceTest/Amazon/Ec2/TestAmazonAbstract.php → test/Ec2/TestAmazonAbstract.php b/...iceTest/Amazon/Ec2/TestAmazonAbstract.php → test/Ec2/TestAmazonAbstract.php
diff --git a/tests/ZendServiceTest/Amazon/OfflineTest.php → test/OfflineTest.php b/tests/ZendServiceTest/Amazon/OfflineTest.php → test/OfflineTest.php
diff --git a/tests/ZendServiceTest/Amazon/OnlineTest.php → test/OnlineTest.php b/tests/ZendServiceTest/Amazon/OnlineTest.php → test/OnlineTest.php
diff --git a/...rviceTest/Amazon/S3/OfflineStreamTest.php → test/S3/OfflineStreamTest.php b/...rviceTest/Amazon/S3/OfflineStreamTest.php → test/S3/OfflineStreamTest.php
diff --git a/...ZendServiceTest/Amazon/S3/OfflineTest.php → test/S3/OfflineTest.php b/...ZendServiceTest/Amazon/S3/OfflineTest.php → test/S3/OfflineTest.php
diff --git a/.../ZendServiceTest/Amazon/S3/OnlineTest.php → test/S3/OnlineTest.php b/.../ZendServiceTest/Amazon/S3/OnlineTest.php → test/S3/OnlineTest.php
diff --git a/.../ZendServiceTest/Amazon/S3/S3RestTest.php → test/S3/S3RestTest.php b/.../ZendServiceTest/Amazon/S3/S3RestTest.php → test/S3/S3RestTest.php
diff --git a/.../ZendServiceTest/Amazon/S3/StreamTest.php → test/S3/StreamTest.php b/.../ZendServiceTest/Amazon/S3/StreamTest.php → test/S3/StreamTest.php
diff --git a/...ZendServiceTest/Amazon/S3/_files/testdata → test/S3/_files/testdata b/...ZendServiceTest/Amazon/S3/_files/testdata → test/S3/_files/testdata
diff --git a/...erviceTest/Amazon/S3/_files/testdata.html → test/S3/_files/testdata.html b/...erviceTest/Amazon/S3/_files/testdata.html → test/S3/_files/testdata.html
diff --git a/...erviceTest/Amazon/SimpleDb/OnlineTest.php → test/SimpleDb/OnlineTest.php b/...erviceTest/Amazon/SimpleDb/OnlineTest.php → test/SimpleDb/OnlineTest.php
diff --git a/...ZendServiceTest/Amazon/Sqs/OnlineTest.php → test/Sqs/OnlineTest.php b/...ZendServiceTest/Amazon/Sqs/OnlineTest.php → test/Sqs/OnlineTest.php
diff --git a/tests/TestConfiguration.php.dist → test/TestConfiguration.php.dist b/tests/TestConfiguration.php.dist → test/TestConfiguration.php.dist
diff --git a/tests/TestConfiguration.php.travis → test/TestConfiguration.php.travis b/tests/TestConfiguration.php.travis → test/TestConfiguration.php.travis
diff --git a/...Amazon/_files/amazon-response-invalid.xml → test/_files/amazon-response-invalid.xml b/...Amazon/_files/amazon-response-invalid.xml → test/_files/amazon-response-invalid.xml
diff --git a/...azon-response-request-throttled-error.xml → ...azon-response-request-throttled-error.xml b/...azon-response-request-throttled-error.xml → ...azon-response-request-throttled-error.xml
diff --git a/...t/Amazon/_files/amazon-response-valid.xml → test/_files/amazon-response-valid.xml b/...t/Amazon/_files/amazon-response-valid.xml → test/_files/amazon-response-valid.xml
diff --git a/...rviceTest/Amazon/_files/mozart_result.xml → test/_files/mozart_result.xml b/...rviceTest/Amazon/_files/mozart_result.xml → test/_files/mozart_result.xml
diff --git a/...eTest/Amazon/_files/offers_with_names.xml → test/_files/offers_with_names.xml b/...eTest/Amazon/_files/offers_with_names.xml → test/_files/offers_with_names.xml