Removed calls to is_null and empty

Author: GrahamCampbell

lib/Gitlab/Api/AbstractApi.php

@@ -63,7 +63,7 @@ public function configure()
      * @param array<string,string> $requestHeaders
      * @return ResponseInterface
      */
-    protected function getAsResponse($path, array $parameters = array(), $requestHeaders = array())
+    protected function getAsResponse($path, array $parameters = array(), array $requestHeaders = array())
     {
         $path = $this->preparePath($path, $parameters);
 
@@ -76,7 +76,7 @@ protected function getAsResponse($path, array $parameters = array(), $requestHea
      * @param array<string,string> $requestHeaders
      * @return mixed
      */
-    protected function get($path, array $parameters = array(), $requestHeaders = array())
+    protected function get($path, array $parameters = array(), array $requestHeaders = array())
     {
         return ResponseMediator::getContent($this->getAsResponse($path, $parameters, $requestHeaders));
     }
@@ -88,15 +88,15 @@ protected function get($path, array $parameters = array(), $requestHeaders = arr
      * @param array<string,string> $files
      * @return mixed
      */
-    protected function post($path, array $parameters = array(), $requestHeaders = array(), array $files = array())
+    protected function post($path, array $parameters = array(), array $requestHeaders = array(), array $files = array())
     {
         $path = $this->preparePath($path);
 
         $body = null;
-        if (empty($files) && !empty($parameters)) {
+        if (0 === count($files) && 0 < count($parameters)) {
             $body = $this->prepareBody($parameters);
             $requestHeaders['Content-Type'] = 'application/x-www-form-urlencoded';
-        } elseif (!empty($files)) {
+        } elseif (0 < count($files)) {
             $builder = new MultipartStreamBuilder($this->streamFactory);
 
             foreach ($parameters as $name => $value) {
@@ -128,15 +128,15 @@ protected function post($path, array $parameters = array(), $requestHeaders = ar
      * @param array<string,string> $files
      * @return mixed
      */
-    protected function put($path, array $parameters = array(), $requestHeaders = array(), array $files = array())
+    protected function put($path, array $parameters = array(), array $requestHeaders = array(), array $files = array())
     {
         $path = $this->preparePath($path);
 
         $body = null;
-        if (empty($files) && !empty($parameters)) {
+        if (0 === count($files) && 0 < count($parameters)) {
             $body = $this->prepareBody($parameters);
             $requestHeaders['Content-Type'] = 'application/x-www-form-urlencoded';
-        } elseif (!empty($files)) {
+        } elseif (0 < count($files)) {
             $builder = new MultipartStreamBuilder($this->streamFactory);
 
             foreach ($parameters as $name => $value) {
@@ -167,7 +167,7 @@ protected function put($path, array $parameters = array(), $requestHeaders = arr
      * @param array<string,string> $requestHeaders
      * @return mixed
      */
-    protected function delete($path, array $parameters = array(), $requestHeaders = array())
+    protected function delete($path, array $parameters = array(), array $requestHeaders = array())
     {
         $path = $this->preparePath($path, $parameters);
 

lib/Gitlab/Api/Jobs.php

@@ -182,7 +182,7 @@ protected function createOptionsResolver()
             ->setAllowedTypes('scope', ['string', 'array'])
             ->setAllowedValues('scope', $allowedScopeValues)
             ->addAllowedValues('scope', function ($value) use ($allowedScopeValues) {
-                return is_array($value) && empty(array_diff($value, $allowedScopeValues));
+                return is_array($value) && 0 === count(array_diff($value, $allowedScopeValues));
             })
             ->setNormalizer('scope', function (OptionsResolver $resolver, $value) {
                 return (array) $value;

lib/Gitlab/Api/Projects.php

@@ -303,7 +303,7 @@ public function allMembers($project_id, $parameters = [])
 
     /**
      * @param int|string $project_id
-     * @param array $parameters {
+     * @param array|string|null $parameters {
      *
      *     @var string $query           The query you want to search members for.
      * }
@@ -316,7 +316,7 @@ public function members($project_id, $parameters = [])
             @trigger_error("Deprecated: String parameter of the members() function is deprecated.", E_USER_NOTICE);
             $username_query = $parameters;
             $parameters = array();
-            if (!empty($username_query)) {
+            if (null !== $username_query && '' !== $username_query) {
                 $parameters['query'] = $username_query;
             }
         }
@@ -459,7 +459,7 @@ public function boards($project_id)
      */
     public function addHook($project_id, $url, array $parameters = array())
     {
-        if (empty($parameters)) {
+        if (0 === count($parameters)) {
             $parameters = array('push_events' => true);
         }
 

lib/Gitlab/Api/Repositories.php

@@ -249,7 +249,7 @@ public function createCommit($project_id, array $parameters = [])
             ->setRequired('actions')
             ->setAllowedTypes('actions', 'array')
             ->setAllowedValues('actions', function (array $actions) {
-                return !empty($actions);
+                return 0 < count($actions);
             })
             ->setNormalizer('actions', function (Options $resolver, array $actions) {
                 $actionsOptionsResolver = new OptionsResolver();

lib/Gitlab/HttpClient/Message/QueryStringBuilder.php

@@ -55,7 +55,7 @@ private static function encode($query, $prefix)
      */
     public static function isIndexedArray(array $query)
     {
-        if (empty($query) || !isset($query[0])) {
+        if (0 === count($query) || !isset($query[0])) {
             return false;
         }
 

lib/Gitlab/HttpClient/Plugin/Authentication.php

@@ -57,7 +57,7 @@ public function doHandleRequest(RequestInterface $request, callable $next, calla
         switch ($this->method) {
             case Client::AUTH_HTTP_TOKEN:
                 $request = $request->withHeader('PRIVATE-TOKEN', $this->token);
-                if (!is_null($this->sudo)) {
+                if (null !== $this->sudo) {
                     $request = $request->withHeader('SUDO', $this->sudo);
                 }
                 break;
@@ -70,11 +70,11 @@ public function doHandleRequest(RequestInterface $request, callable $next, calla
                     'private_token' => $this->token,
                 ];
 
-                if (!is_null($this->sudo)) {
+                if (null !== $this->sudo) {
                     $parameters['sudo'] = $this->sudo;
                 }
 
-                $query .= empty($query) ? '' : '&';
+                $query .= '' === $query ? '' : '&';
                 $query .= utf8_encode(http_build_query($parameters, '', '&'));
 
                 $uri = $uri->withQuery($query);
@@ -83,7 +83,7 @@ public function doHandleRequest(RequestInterface $request, callable $next, calla
 
             case Client::AUTH_OAUTH_TOKEN:
                 $request = $request->withHeader('Authorization', 'Bearer '.$this->token);
-                if (!is_null($this->sudo)) {
+                if (null !== $this->sudo) {
                     $request = $request->withHeader('SUDO', $this->sudo);
                 }
                 break;

lib/Gitlab/Model/AbstractModel.php

@@ -59,10 +59,8 @@ public function api($api)
      */
     protected function hydrate(array $data = array())
     {
-        if (!empty($data)) {
-            foreach ($data as $field => $value) {
-                $this->setData($field, $value);
-            }
+        foreach ($data as $field => $value) {
+            $this->setData($field, $value);
         }
 
         return $this;