Merge branch 'hotfix/google-api-urls'

Close #12
zendframework · Oct 14, 2015 · c2ebc3e · c2ebc3e
2 parents 4a42ecc + 06dc166
commit c2ebc3e
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,22 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.0.3 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#12](https://github.com/zendframework/ZendService_Google_Gcm/pull/12) -
+  Updated GCM URL.
diff --git a/library/ZendService/Google/Exception/InvalidArgumentException.php b/library/ZendService/Google/Exception/InvalidArgumentException.php
@@ -19,5 +19,4 @@
  */
 class InvalidArgumentException extends \InvalidArgumentException
 {
-
 }
diff --git a/library/ZendService/Google/Exception/RuntimeException.php b/library/ZendService/Google/Exception/RuntimeException.php
@@ -19,5 +19,4 @@
  */
 class RuntimeException extends \RuntimeException
 {
-
 }
diff --git a/library/ZendService/Google/Gcm/Client.php b/library/ZendService/Google/Gcm/Client.php
@@ -29,7 +29,7 @@ class Client
     /**
      * @const string Server URI
      */
-    const SERVER_URI = 'https://android.googleapis.com/gcm/send';
+    const SERVER_URI = 'https://gcm-http.googleapis.com/gcm/send';
 
     /**
      * @var Zend\Http\Client

diff --git a/library/ZendService/Google/Gcm/Response.php b/library/ZendService/Google/Gcm/Response.php
@@ -225,7 +225,7 @@ protected function correlate()
         $results = $this->results;
         if ($this->message && $results) {
             $ids = $this->message->getRegistrationIds();
-            while($id = array_shift($ids)) {
+            while ($id = array_shift($ids)) {
                 $results[$id] = array_shift($results);
             }
         }

diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
@@ -11,7 +11,7 @@
 /*
  * Set error reporting to the level to which Zend Framework code must comply.
  */
-error_reporting( E_ALL | E_STRICT );
+error_reporting(E_ALL | E_STRICT);
 
 $phpUnitVersion = PHPUnit_Runner_Version::id();
 if ('@package_version@' !== $phpUnitVersion && version_compare($phpUnitVersion, '3.5.0', '<')) {

diff --git a/tests/ZendService/Google/Gcm/ClientTest.php b/tests/ZendService/Google/Gcm/ClientTest.php
@@ -28,15 +28,14 @@
  */
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
-
     protected $httpAdapter;
     protected $httpClient;
     protected $gcmClient;
     protected $message;
 
     protected function _createJSONResponse($id, $success, $failure, $ids, $results)
     {
-         return json_encode(array(
+        return json_encode(array(
             'multicast_id' => $id,
             'success' => $success,
             'failure' => $failure,

diff --git a/tests/ZendService/Google/Gcm/MessageTest.php b/tests/ZendService/Google/Gcm/MessageTest.php
@@ -24,7 +24,6 @@
  */
 class MessageTest extends \PHPUnit_Framework_TestCase
 {
-
     protected $validRegistrationIds = array('1234567890', '0987654321');
     protected $validData = array('key' => 'value', 'key2' => array('value'));
 
@@ -157,5 +156,4 @@ public function testExpectedDryRunBehavior()
         $this->assertEquals($this->m->getDryRun(), false);
         $this->assertNotContains('dry_run', $this->m->toJson());
     }
-
 }