Updated Rakuten PHP SDK PSR-4.

.travis.yml

@@ -1,7 +1,23 @@
 language: php
 
 php:
-    - 5.3
-    - 5.4
-    - 5.5
-    - 5.6
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+
+sudo: false
+
+before_install:
+  - travis_retry composer self-update
+
+install:
+  - travis_retry composer update --prefer-dist --no-interaction --prefer-stable
+
+script: vendor/bin/phpunit

composer.json

@@ -7,24 +7,41 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "Shogo Kawahara",
-            "email": "shogo.a.kawahara@mail.rakuten.com"
+            "name": "Andrew Miller",
+            "email": "andrew.miller@rakuten.com"
         }
     ],
     "require": {
-        "php": ">=5.2.3",
+        "php": ">=5.3.19",
         "ext-openssl": "*"
     },
+    "require-dev": {
+        "phpunit/phpunit": "4.*",
+        "pear-pear.php.net/HTTP_Client": "*"
+    },
     "suggest": {
         "ext-curl": "*",
-        "pear-pear/HTTP_Client": "*"
+        "pear-pear.php.net/HTTP_Client": "*"
     },
     "autoload": {
-        "psr-0": {"RakutenRws_": "lib/"}
+        "psr-4": {
+            "RakutenRws\\": "lib/RakutenRws/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "RakutenRws\\": "test/RakutenRws/"
+        }
     },
+    "repositories": [
+        {
+            "type": "pear",
+            "url": "https://pear.php.net"
+        }
+    ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-master": "2.0.x-dev"
         }
     }
 }

lib/RakutenRws/Api/ApiInterface.php

@@ -9,13 +9,15 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api;
+
 /**
  * The interface of API
  *
  * @package RakutenRws
  * @subpackage Api
  */
-interface RakutenRws_Api_ApiInterface
+interface ApiInterface
 {
     public function getAvailableVersions();
     public function getOperationName();

lib/RakutenRws/Api/AppRakutenApi.php

@@ -9,13 +9,18 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api;
+
+use RakutenRws\Exception;
+use RakutenRws\ApiResponse\AppRakutenResponse;
+
 /**
  * API for app.rakuten.co.jp
  *
  * @package RakutenRws
  * @subpackage Api
  */
-abstract class RakutenRws_Api_AppRakutenApi extends RakutenRws_Api_Base
+abstract class AppRakutenApi extends Base
 {
     const BASE_URL = 'https://app.rakuten.co.jp/services/api';
 
@@ -68,12 +73,12 @@ public function execute($parameter)
 
         $response = $client->$method($url, $parameter);
 
-        $appresponse = new RakutenRws_ApiResponse_AppRakutenResponse($this->getOperationName(), $response);
+        $appresponse = new AppRakutenResponse($this->getOperationName(), $response);
 
         if ($this->autoSetIterator && $appresponse->isOk()) {
             $data = $appresponse->getData();
             if (!isset($data[$this->arrayName])) {
-                throw new RakutenRws_Exception();
+                throw new Exception();
             }
 
             $items = array();

lib/RakutenRws/Api/Base.php

@@ -9,13 +9,19 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api;
+
+use LogicException;
+use RakutenRws\Client;
+use RakutenRws\Exception;
+
 /**
  * API base class
  *
  * @package RakutenRws
  * @subpackage Api
  */
-abstract class RakutenRws_Api_Base implements RakutenRws_Api_ApiInterface
+abstract class Base implements ApiInterface
 {
     protected
         $version         = null,
@@ -24,7 +30,7 @@ abstract class RakutenRws_Api_Base implements RakutenRws_Api_ApiInterface
         $autoSetIterator = false,
         $options         = array();
 
-    public function __construct(RakutenRws_Client $client, $options = array())
+    public function __construct(Client $client, $options = array())
     {
         $this->options = $options;
         $this->client  = $client;
@@ -38,7 +44,7 @@ public function getAvailableVersions()
 
     public function getOperationName()
     {
-        $className = explode('_', get_class($this));
+        $className = explode('\\', get_class($this));
         return end($className);
     }
 
@@ -59,7 +65,7 @@ public function getLatestVersion()
     public function setVersion($version)
     {
         if (!in_array($version, $this->getAvailableVersions())) {
-            throw new RakutenRws_Exception(sprintf('version %s is not defined.', $version));
+            throw new Exception(sprintf('version %s is not defined.', $version));
         }
 
         $this->version = $version;

lib/RakutenRws/Api/Definition/AuctionGenreIdSearch.php

@@ -9,13 +9,17 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api\Definition;
+
+use RakutenRws\Api\AppRakutenApi;
+
 /**
  * AuctionGenreIdSearch
  *
  * @package RakutenRws
- * @subpackage Api_Definition
+ * @subpackage Api\Definition
  */
-class RakutenRws_Api_Definition_AuctionGenreIdSearch extends RakutenRws_Api_AppRakutenApi
+class AuctionGenreIdSearch extends AppRakutenApi
 {
     protected
         $isRequiredAccessToken = false,

lib/RakutenRws/Api/Definition/AuctionGenreKeywordSearch.php

@@ -9,13 +9,18 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api\Definition;
+
+use RakutenRws\Exception;
+use RakutenRws\Api\AppRakutenApi;
+
 /**
  * AuctionGenreKeywordSearch
  *
  * @package RakutenRws
- * @subpackage Api_Definition
+ * @subpackage Api\Definition
  */
-class RakutenRws_Api_Definition_AuctionGenreKeywordSearch extends RakutenRws_Api_AppRakutenApi
+class AuctionGenreKeywordSearch extends AppRakutenApi
 {
     protected
         $isRequiredAccessToken = false,
@@ -40,7 +45,7 @@ public function execute($parameter)
         if ($appresponse->isOk()) {
             $data = $appresponse->getData();
             if (!isset($data['auctionGenreList'])) {
-                throw new RakutenRws_Exception();
+                throw new Exception();
             }
 
             $appresponse->setIterator($data['auctionGenreList']);

lib/RakutenRws/Api/Definition/AuctionItemCodeSearch.php

@@ -9,13 +9,17 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api\Definition;
+
+use RakutenRws\Api\AppRakutenApi;
+
 /**
  * AuctionItemCodeSearch
  *
  * @package RakutenRws
- * @subpackage Api_Definition
+ * @subpackage Api\Definition
  */
-class RakutenRws_Api_Definition_AuctionItemCodeSearch extends RakutenRws_Api_AppRakutenApi
+class AuctionItemCodeSearch extends AppRakutenApi
 {
     protected
         $isRequiredAccessToken = false,

lib/RakutenRws/Api/Definition/AuctionItemSearch.php

@@ -9,13 +9,17 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api\Definition;
+
+use RakutenRws\Api\AppRakutenApi;
+
 /**
  * AuctionItemSearch2
  *
  * @package RakutenRws
- * @subpackage Api_Definition
+ * @subpackage Api\Definition
  */
-class RakutenRws_Api_Definition_AuctionItemSearch extends RakutenRws_Api_AppRakutenApi
+class AuctionItemSearch extends AppRakutenApi
 {
     protected
         $autoSetIterator = true,

lib/RakutenRws/Api/Definition/BooksBookSearch.php

@@ -9,13 +9,17 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api\Definition;
+
+use RakutenRws\Api\AppRakutenApi;
+
 /**
  * BooksBookSearch
  *
  * @package RakutenRws
- * @subpackage Api_Definition
+ * @subpackage Api\Definition
  */
-class RakutenRws_Api_Definition_BooksBookSearch extends RakutenRws_Api_AppRakutenApi
+class BooksBookSearch extends AppRakutenApi
 {
     protected
         $autoSetIterator = true,

lib/RakutenRws/Api/Definition/BooksCDSearch.php

@@ -9,13 +9,17 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api\Definition;
+
+use RakutenRws\Api\AppRakutenApi;
+
 /**
  * BooksCDSearch
  *
  * @package RakutenRws
- * @subpackage Api_Definition
+ * @subpackage Api\Definition
  */
-class RakutenRws_Api_Definition_BooksCDSearch extends RakutenRws_Api_AppRakutenApi
+class BooksCDSearch extends AppRakutenApi
 {
     protected
         $autoSetIterator = true,

lib/RakutenRws/Api/Definition/BooksDVDSearch.php

@@ -9,13 +9,17 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api\Definition;
+
+use RakutenRws\Api\AppRakutenApi;
+
 /**
  * BooksDVDSearch
  *
  * @package RakutenRws
- * @subpackage Api_Definition
+ * @subpackage Api\Definition
  */
-class RakutenRws_Api_Definition_BooksDVDSearch extends RakutenRws_Api_AppRakutenApi
+class BooksDVDSearch extends AppRakutenApi
 {
     protected
         $autoSetIterator = true,

lib/RakutenRws/Api/Definition/BooksForeignBookSearch.php

@@ -9,13 +9,17 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api\Definition;
+
+use RakutenRws\Api\AppRakutenApi;
+
 /**
  * BooksForeignBooksSearch
  *
  * @package RakutenRws
- * @subpackage Api_Definition
+ * @subpackage Api\Definition
  */
-class RakutenRws_Api_Definition_BooksForeignBookSearch extends RakutenRws_Api_AppRakutenApi
+class BooksForeignBookSearch extends AppRakutenApi
 {
     protected
         $autoSetIterator = true,

lib/RakutenRws/Api/Definition/BooksGameSearch.php

@@ -9,13 +9,17 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api\Definition;
+
+use RakutenRws\Api\AppRakutenApi;
+
 /**
  * BooksGameSearch
  *
  * @package RakutenRws
- * @subpackage Api_Definition
+ * @subpackage Api\Definition
  */
-class RakutenRws_Api_Definition_BooksGameSearch extends RakutenRws_Api_AppRakutenApi
+class BooksGameSearch extends AppRakutenApi
 {
     protected
         $autoSetIterator = true,

lib/RakutenRws/Api/Definition/BooksGenreSearch.php

@@ -9,13 +9,17 @@
  * file that was distributed with source code.
  */
 
+namespace RakutenRws\Api\Definition;
+
+use RakutenRws\Api\AppRakutenApi;
+
 /**
  * BooksGenreSearch
  *
  * @package RakutenRws
- * @subpackage Api_Definition
+ * @subpackage Api\Definition
  */
-class RakutenRws_Api_Definition_BooksGenreSearch extends RakutenRws_Api_AppRakutenApi
+class BooksGenreSearch extends AppRakutenApi
 {
     protected
         $isRequiredAccessToken = false,