Static Code Analysis with Php Inspections (EA Extended) (googleapis#1174

) * language level fixes * dead code dropped * one-time use variables inlined * control flow simplifications * changes code review * unnecessary parenthesises dropped * fixed CS
Barada123 · Mar 22, 2017 · 43996f0 · 43996f0
1 parent e430670
commit 43996f0
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 50 deletions.
diff --git a/src/Google/AccessToken/Revoke.php b/src/Google/AccessToken/Revoke.php
@@ -72,10 +72,7 @@ public function revokeToken($token)
     $httpHandler = HttpHandlerFactory::build($this->http);
 
     $response = $httpHandler($request);
-    if ($response->getStatusCode() == 200) {
-      return true;
-    }
 
-    return false;
+    return $response->getStatusCode() == 200;
   }
 }
diff --git a/src/Google/AccessToken/Verify.php b/src/Google/AccessToken/Verify.php
@@ -53,11 +53,11 @@ public function __construct(
       CacheItemPoolInterface $cache = null,
       $jwt = null
   ) {
-    if (is_null($http)) {
+    if (null === $http) {
       $http = new Client();
     }
 
-    if (is_null($cache)) {
+    if (null === $cache) {
       $cache = new MemoryCacheItemPool;
     }
 

diff --git a/src/Google/Client.php b/src/Google/Client.php
@@ -262,7 +262,7 @@ public function refreshToken($refreshToken)
    */
   public function fetchAccessTokenWithRefreshToken($refreshToken = null)
   {
-    if (is_null($refreshToken)) {
+    if (null === $refreshToken) {
       if (!isset($this->token['refresh_token'])) {
         throw new LogicException(
             'refresh token must be passed in or set as part of setAccessToken'
@@ -352,7 +352,7 @@ public function authorize(ClientInterface $http = null)
     $credentials = null;
     $token = null;
     $scopes = null;
-    if (is_null($http)) {
+    if (null === $http) {
       $http = $this->getHttpClient();
     }
 
@@ -366,7 +366,7 @@ public function authorize(ClientInterface $http = null)
     } elseif ($token = $this->getAccessToken()) {
       $scopes = $this->prepareScopes();
       // add refresh subscriber to request a new token
-      if ($this->isAccessTokenExpired() && isset($token['refresh_token'])) {
+      if (isset($token['refresh_token']) && $this->isAccessTokenExpired()) {
         $credentials = $this->createUserRefreshCredentials(
             $scopes,
             $token['refresh_token']
@@ -477,10 +477,7 @@ public function isAccessTokenExpired()
     }
 
     // If the token is set to expire in the next 30 seconds.
-    $expired = ($created
-      + ($this->token['expires_in'] - 30)) < time();
-
-    return $expired;
+    return ($created + ($this->token['expires_in'] - 30)) < time();
   }
 
   public function getAuth()
@@ -598,7 +595,7 @@ public function setApplicationName($applicationName)
   public function setRequestVisibleActions($requestVisibleActions)
   {
     if (is_array($requestVisibleActions)) {
-      $requestVisibleActions = join(" ", $requestVisibleActions);
+      $requestVisibleActions = implode(" ", $requestVisibleActions);
     }
     $this->config['request_visible_actions'] = $requestVisibleActions;
   }
@@ -699,7 +696,7 @@ public function verifyIdToken($idToken = null)
         $this->config['jwt']
     );
 
-    if (is_null($idToken)) {
+    if (null === $idToken) {
       $token = $this->getAccessToken();
       if (!isset($token['id_token'])) {
         throw new LogicException(
@@ -764,8 +761,8 @@ public function prepareScopes()
     if (empty($this->requestedScopes)) {
       return null;
     }
-    $scopes = implode(' ', $this->requestedScopes);
-    return $scopes;
+
+    return implode(' ', $this->requestedScopes);
   }
 
   /**
@@ -1031,7 +1028,7 @@ public function setHttpClient(ClientInterface $http)
    */
   public function getHttpClient()
   {
-    if (is_null($this->http)) {
+    if (null === $this->http) {
       $this->http = $this->createDefaultHttpClient();
     }
 

diff --git a/src/Google/Collection.php b/src/Google/Collection.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/autoload.php';
+  require_once __DIR__ . '/autoload.php';
 }
 
 /**

diff --git a/src/Google/Http/Batch.php b/src/Google/Http/Batch.php
@@ -138,7 +138,7 @@ public function parseResponse(ResponseInterface $response, $classes = array())
     $contentType = explode(';', $contentType);
     $boundary = false;
     foreach ($contentType as $part) {
-      $part = (explode('=', $part, 2));
+      $part = explode('=', $part, 2);
       if (isset($part[0]) && 'boundary' == trim($part[0])) {
         $boundary = $part[1];
       }
@@ -170,10 +170,6 @@ public function parseResponse(ResponseInterface $response, $classes = array())
 
           // Need content id.
           $key = $headers['content-id'];
-          $class = '';
-          if (!empty($this->expected_classes[$key])) {
-            $class = $this->expected_classes[$key];
-          }
 
           try {
             $response = Google_Http_REST::decodeHttpResponse($response, $requests[$i-1]);

diff --git a/src/Google/Http/MediaFileUpload.php b/src/Google/Http/MediaFileUpload.php
@@ -221,9 +221,7 @@ private function process()
         Uri::withQueryValue($request->getUri(), 'uploadType', $uploadType)
     );
 
-    $mimeType = $this->mimeType ?
-        $this->mimeType :
-        $request->getHeaderLine('content-type');
+    $mimeType = $this->mimeType ?: $request->getHeaderLine('content-type');
 
     if (self::UPLOAD_RESUMABLE_TYPE == $uploadType) {
       $contentType = $mimeType;
@@ -233,7 +231,7 @@ private function process()
       $postBody = $this->data;
     } else if (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
       // This is a multipart/related upload.
-      $boundary = $this->boundary ? $this->boundary : mt_rand();
+      $boundary = $this->boundary ?: mt_rand();
       $boundary = str_replace('"', '', $boundary);
       $contentType = 'multipart/related; boundary=' . $boundary;
       $related = "--$boundary\r\n";
@@ -280,7 +278,7 @@ public function getUploadType($meta)
 
   public function getResumeUri()
   {
-    if (is_null($this->resumeUri)) {
+    if (null === $this->resumeUri) {
       $this->resumeUri = $this->fetchResumeUri();
     }
 
@@ -289,7 +287,6 @@ public function getResumeUri()
 
   private function fetchResumeUri()
   {
-    $result = null;
     $body = $this->request->getBody();
     if ($body) {
       $headers = array(

diff --git a/src/Google/Http/REST.php b/src/Google/Http/REST.php
@@ -51,7 +51,7 @@ public static function execute(
         array($client, $request, $expectedClass)
     );
 
-    if (!is_null($retryMap)) {
+    if (null !== $retryMap) {
       $runner->setRetryMap($retryMap);
     }
 
@@ -110,7 +110,7 @@ public static function decodeHttpResponse(
     $code = $response->getStatusCode();
 
     // retry strategy
-    if ((intVal($code)) >= 400) {
+    if (intVal($code) >= 400) {
       // if we errored out, it should be safe to grab the response body
       $body = (string) $response->getBody();
 
@@ -149,7 +149,7 @@ private static function determineExpectedClass($expectedClass, RequestInterface
     }
 
     // if we don't have a request, we just use what's passed in
-    if (is_null($request)) {
+    if (null === $request) {
       return $expectedClass;
     }
 

diff --git a/src/Google/Model.php b/src/Google/Model.php
@@ -192,8 +192,7 @@ private function nullPlaceholderCheck($value)
    */
   private function getMappedName($key)
   {
-    if (isset($this->internal_gapi_mappings) &&
-        isset($this->internal_gapi_mappings[$key])) {
+    if (isset($this->internal_gapi_mappings, $this->internal_gapi_mappings[$key])) {
       $key = $this->internal_gapi_mappings[$key];
     }
     return $key;

diff --git a/src/Google/Service/Resource.php b/src/Google/Service/Resource.php
@@ -267,7 +267,7 @@ public function createRequestUri($restPath, $params)
     $queryVars = array();
     foreach ($params as $paramName => $paramSpec) {
       if ($paramSpec['type'] == 'boolean') {
-        $paramSpec['value'] = ($paramSpec['value']) ? 'true' : 'false';
+        $paramSpec['value'] = $paramSpec['value'] ? 'true' : 'false';
       }
       if ($paramSpec['location'] == 'path') {
         $uriTemplateVars[$paramName] = $paramSpec['value'];

diff --git a/src/Google/Task/Runner.php b/src/Google/Task/Runner.php
@@ -55,10 +55,6 @@ class Google_Task_Runner
    */
   private $maxAttempts = 1;
 
-  /**
-   * @var string $name The name of the current task (used for logging).
-   */
-  private $name;
   /**
    * @var callable $action The task to run and possibly retry.
    */
@@ -153,7 +149,6 @@ public function __construct(
         );
     }
 
-    $this->name = $name;
     $this->action = $action;
     $this->arguments = $arguments;
   }
@@ -269,8 +264,10 @@ public function allowedRetries($code, $errors = array())
       return $this->retryMap[$code];
     }
 
-    if (!empty($errors) && isset($errors[0]['reason']) &&
-        isset($this->retryMap[$errors[0]['reason']])) {
+    if (
+        !empty($errors) &&
+        isset($errors[0]['reason'], $this->retryMap[$errors[0]['reason']])
+    ) {
       return $this->retryMap[$errors[0]['reason']];
     }
 

diff --git a/tests/BaseTest.php b/tests/BaseTest.php
@@ -139,8 +139,8 @@ public function tryToGetAnAccessToken(Google_Client $client)
 
   private function getClientIdAndSecret()
   {
-    $clientId = getenv('GCLOUD_CLIENT_ID') ? getenv('GCLOUD_CLIENT_ID') : null;
-    $clientSecret = getenv('GCLOUD_CLIENT_SECRET') ? getenv('GCLOUD_CLIENT_SECRET') : null;
+    $clientId = getenv('GCLOUD_CLIENT_ID') ?: null;
+    $clientSecret = getenv('GCLOUD_CLIENT_SECRET') ?: null;
 
     return array($clientId, $clientSecret);
   }
@@ -182,7 +182,7 @@ public function checkKey()
 
   public function loadKey()
   {
-    if (file_exists($f = dirname(__FILE__) . DIRECTORY_SEPARATOR . '.apiKey')) {
+    if (file_exists($f = __DIR__ . DIRECTORY_SEPARATOR . '.apiKey')) {
       return file_get_contents($f);
     }
   }

diff --git a/tests/Google/ClientTest.php b/tests/Google/ClientTest.php
@@ -50,7 +50,7 @@ private function checkAuthHandler($http, $className)
       $middlewares = $property->getValue($stack);
       $middleware = array_pop($middlewares);
 
-      if (is_null($className)) {
+      if (null === $className) {
         // only the default middlewares have been added
         $this->assertEquals(3, count($middlewares));
       } else {
@@ -60,7 +60,7 @@ private function checkAuthHandler($http, $className)
     } else {
       $listeners = $http->getEmitter()->listeners('before');
 
-      if (is_null($className)) {
+      if (null === $className) {
         $this->assertEquals(0, count($listeners));
       } else {
         $authClass = sprintf('Google\Auth\Subscriber\%sSubscriber', $className);

diff --git a/tests/Google/Service/TasksTest.php b/tests/Google/Service/TasksTest.php
@@ -59,7 +59,7 @@ public function testListTask()
     }
 
     $tasksArray = $tasks->listTasks($list['id']);
-    $this->assertTrue(sizeof($tasksArray) > 1);
+    $this->assertTrue(count($tasksArray) > 1);
     foreach ($tasksArray['items'] as $task) {
       $this->assertIsTask($task);
     }

diff --git a/tests/Google/ServiceTest.php b/tests/Google/ServiceTest.php
@@ -108,7 +108,7 @@ class_exists($class),
   public function serviceProvider()
   {
     $classes = array();
-    $path = dirname(dirname(dirname(__FILE__))) . '/src/Google/Service';
+    $path = dirname(dirname(__DIR__)) . '/src/Google/Service';
     foreach (glob($path . "/*.php") as $file) {
       $classes[] = array('Google_Service_' . basename($file, '.php'));
     }