Merge pull request #252 from HubSpot/feature/fixRequestOnPhp7.3

Fix request on php7.3 and cs fix
HubSpot · Jun 8, 2023 · ac47b9a · ac47b9a
2 parents 6fed8cb + eb3cf73
commit ac47b9a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/lib/Factory.php b/lib/Factory.php
@@ -11,9 +11,6 @@
  */
 class Factory
 {
-    /**
-     * @param array $config
-     */
     public static function create(ClientInterface $client = null, Config $config = null): Discovery
     {
         return new Discovery($client ?: new Client(), $config ?: new Config());

diff --git a/lib/Http/Request.php b/lib/Http/Request.php
@@ -6,14 +6,27 @@
 
 class Request
 {
-    protected array $options = [];
-    protected string $baseUrl = 'https://api.hubapi.com';
+    /** @var array */
+    protected $options = [];
+
+    /** @var string */
+    protected $baseUrl = 'https://api.hubapi.com';
     protected $body;
-    protected Config $config;
-    protected bool $defaultJson = true;
-    protected string $url;
-    protected string $method;
-    protected array  $headers = [];
+
+    /** @var Config */
+    protected $config;
+
+    /** @var bool */
+    protected $defaultJson = true;
+
+    /** @var string */
+    protected $url;
+
+    /** @var string */
+    protected $method;
+
+    /** @var array */
+    protected $headers = [];
 
     public function __construct(Config $config, array $options = [])
     {

diff --git a/tests/Unit/Utils/OAuth2Test.php b/tests/Unit/Utils/OAuth2Test.php
@@ -20,6 +20,7 @@ public function buildAuthorizationUrl()
             ['contacts', 'timeline'],
             ['scope1', 'scope2']
         );
+
         $this->assertSame(
             'https://app.hubspot.com/oauth/authorize?client_id=clientid&redirect_uri=http%3A%2F%2Flocalhost&scope=contacts%20timeline&optional_scope=scope1%20scope2',
             $authUrl
@@ -34,6 +35,7 @@ public function buildAuthorizationUrlWithEmptyOptionalScope()
             'http://localhost',
             ['contacts', 'timeline']
         );
+
         $this->assertSame(
             'https://app.hubspot.com/oauth/authorize?client_id=clientid&redirect_uri=http%3A%2F%2Flocalhost&scope=contacts%20timeline',
             $authUrl