Merge pull request #22 from upwork/v1.2.5

v1.3.0
upwork · May 25, 2018 · 56fd692 · 56fd692
2 parents d2f33a9 + 91c0ce0
commit 56fd692
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 219 deletions.
diff --git a/.tests b/.tests
@@ -0,0 +1 @@
+./vendor/phpunit/phpunit/phpunit.php --stderr
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,6 @@ language: php
 php:
   - "5.6"
   - "5.5"
-  - "5.4"
-  - "5.3"
   - hhvm
 
 before_script:

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Release History
 
+## 1.3.0
+* Stop supporting deprecated Teamrooms API
+* Migrate Workdiaries, Workdays and Snapshots API to v3
+
 ## 1.2.4
 * fix a typo in the README
 * Readline ignores \n - add space between authorization URL and the second part of the promt

diff --git a/composer.json b/composer.json
@@ -1,11 +1,11 @@
 {
     "name": "upwork/php-upwork",
     "description": "PHP bindings for Upwork API",
-    "version": "v1.2.4",
+    "version": "v1.3.0",
     "type": "library",
     "keywords": ["upwork", "php", "api"],
     "homepage": "http://www.upwork.com",
-    "time": "2017-02-15",
+    "time": "2018-05-24",
     "license": "Apache-2.0",
     "authors": [
         {
@@ -23,7 +23,9 @@
         "wiki": "http://developers.upwork.com"
     },
     "suggest": {
-        "ext-oauth": "This extension from PECL provides OAuth consumer and provider bindings. See more under http://www.php.net/oauth"
+        "ext-oauth": "This extension from PECL provides OAuth consumer and provider bindings. See more under http://www.php.net/oauth",
+	"apigen/apigen": "dev-master",
+        "roave/better-reflection": "dev-master"
     },
     "require": {
         "php": ">=5.3.3",

diff --git a/docs/docs.zip b/docs/docs.zip
diff --git a/src/Upwork/API/AuthTypes/AbstractOAuth.php b/src/Upwork/API/AuthTypes/AbstractOAuth.php
@@ -37,7 +37,7 @@ abstract class AbstractOAuth
      */
     static protected $_secret = null;
     /**
-     * @var oauth_token, shared request token (temporary)
+     * @var oauth_token shared request token (temporary)
      */
     static protected $_requestToken = null;
     /**

diff --git a/src/Upwork/API/Routers/Snapshot.php b/src/Upwork/API/Routers/Snapshot.php
@@ -42,61 +42,6 @@ public function __construct(ApiClient $client)
         parent::$_epoint = self::ENTRY_POINT;
     }
 
-    /**
-     * Get snapshot info
-     *
-     * @param   string $company Company
-     * @param   string $username Username
-     * @param   string $ts Timestamp
-     * @return  object
-     */
-    public function get($company, $username, $ts)
-    {
-        ApiDebug::p(__FUNCTION__);
-
-        $response = $this->_client->get('/team/v1/snapshots/' . $company . '/' . $username . '/' . $ts);
-        ApiDebug::p('found response info', $response);
-
-        return $response;
-    }
-
-    /**
-     * Update snapshot
-     *
-     * @param   string $company Company
-     * @param   string $username Username
-     * @param   string $ts Timestamp
-     * @param   array $params Parameters
-     * @return  object
-     */
-    public function update($company, $username, $ts, $params)
-    {
-        ApiDebug::p(__FUNCTION__);
-
-        $response = $this->_client->put('/team/v1/snapshots/' . $company . '/' . $username . '/' . $ts, $params);
-        ApiDebug::p('found response info', $response);
-
-        return $response;
-    }
-
-    /**
-     * Delete snapshot
-     *
-     * @param   string $company Company
-     * @param   string $username Username
-     * @param   string $ts Timestamp
-     * @return  object
-     */
-    public function delete($company, $username, $ts)
-    {
-        ApiDebug::p(__FUNCTION__);
-
-        $response = $this->_client->delete('/team/v1/snapshots/' . $company . '/' . $username . '/' . $ts);
-        ApiDebug::p('found response info', $response);
-
-        return $response;
-    }
-
     /**
      * Get snapshot info by specific contract
      *
@@ -108,7 +53,7 @@ public function getByContract($contractId, $ts)
     {
         ApiDebug::p(__FUNCTION__);
 
-        $response = $this->_client->get('/team/v2/snapshots/contracts/' . $contractId . '/' . $ts);
+        $response = $this->_client->get('/team/v3/snapshots/contracts/' . $contractId . '/' . $ts);
         ApiDebug::p('found response info', $response);
 
         return $response;
@@ -126,7 +71,7 @@ public function updateByContract($contractId, $ts, $params)
     {
         ApiDebug::p(__FUNCTION__);
 
-        $response = $this->_client->put('/team/v2/snapshots/contracts/' . $contractId . '/' . $ts, $params);
+        $response = $this->_client->put('/team/v3/snapshots/contracts/' . $contractId . '/' . $ts, $params);
         ApiDebug::p('found response info', $response);
 
         return $response;
@@ -143,7 +88,7 @@ public function deleteByContract($contractId, $ts)
     {
         ApiDebug::p(__FUNCTION__);
 
-        $response = $this->_client->delete('/team/v2/snapshots/contracts/' . $contractId . '/' . $ts);
+        $response = $this->_client->delete('/team/v3/snapshots/contracts/' . $contractId . '/' . $ts);
         ApiDebug::p('found response info', $response);
 
         return $response;

diff --git a/src/Upwork/API/Routers/Teams.php b/src/Upwork/API/Routers/Teams.php
diff --git a/src/Upwork/API/Routers/Workdays.php b/src/Upwork/API/Routers/Workdays.php
@@ -55,7 +55,7 @@ public function getByCompany($company, $fromDate, $tillDate, $params = array())
     {
         ApiDebug::p(__FUNCTION__);
 
-        $response = $this->_client->get('/team/v2/workdays/companies/' . $company . '/' . $fromDate . ',' . $tillDate, $params);
+        $response = $this->_client->get('/team/v3/workdays/companies/' . $company . '/' . $fromDate . ',' . $tillDate, $params);
         ApiDebug::p('found response info', $response);
 
         return $response;
@@ -74,7 +74,7 @@ public function getByContract($contract, $fromDate, $tillDate, $params = array()
     {
         ApiDebug::p(__FUNCTION__);
 
-        $response = $this->_client->get('/team/v2/workdays/contracts/' . $company . '/' . $fromDate . ',' . $tillDate, $params);
+        $response = $this->_client->get('/team/v3/workdays/contracts/' . $company . '/' . $fromDate . ',' . $tillDate, $params);
         ApiDebug::p('found response info', $response);
 
         return $response;

diff --git a/src/Upwork/API/Routers/Workdiary.php b/src/Upwork/API/Routers/Workdiary.php
@@ -46,16 +46,15 @@ public function __construct(ApiClient $client)
      * Get Workdiary
      *
      * @param   string $company Company ID
-     * @param   string $username User ID
      * @param   string $date Date
      * @param   array $params (Optional) Parameters
      * @return  object
      */
-    public function get($company, $username, $date, $params = array())
+    public function get($company, $date, $params = array())
     {
         ApiDebug::p(__FUNCTION__);
 
-        $response = $this->_client->get('/team/v1/workdiaries/' . $company . '/' . $username . '/' . $date, $params);
+        $response = $this->_client->get('/team/v3/workdiaries/companies/' . $company . '/' . $date, $params);
         ApiDebug::p('found response info', $response);
 
         return $response;
@@ -73,7 +72,7 @@ public function getByContract($contract, $date, $params = array())
     {
         ApiDebug::p(__FUNCTION__);
 
-        $response = $this->_client->get('/team/v2/workdiaries/contracts/' . $contract . '/' . $date, $params);
+        $response = $this->_client->get('/team/v3/workdiaries/contracts/' . $contract . '/' . $date, $params);
         ApiDebug::p('found response info', $response);
 
         return $response;

diff --git a/tests/Upwork/API/Routers/Hr/MilestonesTest.php b/tests/Upwork/API/Routers/Hr/MilestonesTest.php
@@ -76,7 +76,7 @@ public function testActivate()
     public function testApprove()
     {
         $router = new \Upwork\API\Routers\Hr\Milestones($this->_client);
-        $response = $router->approve(array());
+        $response = $router->approve('1234', array());
 
         $this->_checkResponse($response);
     }
@@ -87,7 +87,7 @@ public function testApprove()
     public function testDelete()
     {
         $router = new \Upwork\API\Routers\Hr\Milestones($this->_client);
-        $response = $router->delete(array());
+        $response = $router->delete('1234');
 
         $this->_checkResponse($response);
     }

diff --git a/tests/Upwork/API/Routers/SnapshotTest.php b/tests/Upwork/API/Routers/SnapshotTest.php
@@ -13,39 +13,6 @@ public function setUp()
         parent::setUp();
     }
 
-    /**
-     * @test
-     */
-    public function testGet()
-    {
-        $router = new \Upwork\API\Routers\Snapshot($this->_client);
-        $response = $router->get('company', 'username', '1234567890');
-
-        $this->_checkResponse($response);
-    }
-
-    /**
-     * @test
-     */
-    public function testUpdate()
-    {
-        $router = new \Upwork\API\Routers\Snapshot($this->_client);
-        $response = $router->update('company', 'username', '1234567890', array());
-
-        $this->_checkResponse($response);
-    }
-
-    /**
-     * @test
-     */
-    public function testDelete()
-    {
-        $router = new \Upwork\API\Routers\Snapshot($this->_client);
-        $response = $router->delete('company', 'username', '1234567890');
-
-        $this->_checkResponse($response);
-    }
-
     /**
      * @test
      */

diff --git a/tests/Upwork/API/Routers/TeamsTest.php b/tests/Upwork/API/Routers/TeamsTest.php
diff --git a/tests/Upwork/API/Routers/WorkdiaryTest.php b/tests/Upwork/API/Routers/WorkdiaryTest.php
@@ -19,7 +19,7 @@ public function setUp()
     public function testGet()
     {
         $router = new \Upwork\API\Routers\Workdiary($this->_client);
-        $response = $router->get('company', 'username', '20140101', array());
+        $response = $router->get('company', '20140101', array());
 
         $this->_checkResponse($response);
     }