Apply fixes from StyleCI (#27)

danmichaelo · StyleCIBot · web-flow · commit e0d8a972e36c · 2022-12-17T22:43:04.000+01:00
Co-authored-by: StyleCI Bot &lt;bot@styleci.io&gt;
diff --git a/spec/Bibs/PortfolioSpec.php b/spec/Bibs/PortfolioSpec.php
@@ -5,7 +5,6 @@
 use PhpSpec\ObjectBehavior;
 use Scriptotek\Alma\Bibs\Bib;
 use Scriptotek\Alma\Bibs\Portfolio;
-use Scriptotek\Alma\Bibs\Portfolios;
 use Scriptotek\Alma\Client as AlmaClient;
 use Scriptotek\Alma\Electronic\Collection;
 use spec\Scriptotek\Alma\SpecHelper;
diff --git a/spec/Bibs/RepresentationSpec.php b/spec/Bibs/RepresentationSpec.php
@@ -6,7 +6,6 @@
 use Scriptotek\Alma\Bibs\Bib;
 use Scriptotek\Alma\Bibs\File;
 use Scriptotek\Alma\Bibs\Representation;
-use Scriptotek\Alma\Bibs\Representations;
 use Scriptotek\Alma\Client as AlmaClient;
 use spec\Scriptotek\Alma\SpecHelper;
 
diff --git a/spec/ClientSpec.php b/spec/ClientSpec.php
@@ -35,7 +35,6 @@ public function it_can_be_configured_with_custom_base_url()
         $this->entrypoint->shouldBe('http://proxy.foxy');
     }
 
-
     protected function httpWithResponseBody($body, $statusCode = 200, $headers = [])
     {
         $http = $this->let();
diff --git a/spec/Conf/JobInstanceSpec.php b/spec/Conf/JobInstanceSpec.php
@@ -25,4 +25,4 @@ public function it_should_belong_to_a_job()
     {
         $this->job->shouldBeAnInstanceOf(Job::class);
     }
-}
+}
diff --git a/spec/SpecHelper.php b/spec/SpecHelper.php
@@ -3,11 +3,11 @@
 namespace spec\Scriptotek\Alma;
 
 use Danmichaelo\QuiteSimpleXMLElement\QuiteSimpleXMLElement;
+use function GuzzleHttp\Psr7\stream_for;
 use Http\Client\Common\Exception\ClientErrorException;
 use Http\Factory\Guzzle\RequestFactory;
 use Http\Factory\Guzzle\ResponseFactory;
 use Prophecy\Argument;
-use function GuzzleHttp\Psr7\stream_for;
 
 class SpecHelper
 {
diff --git a/spec/Users/UserSpec.php b/spec/Users/UserSpec.php
@@ -76,7 +76,7 @@ public function it_has_sms()
     {
         $this->getSmsNumber()->shouldBe('87654321');
     }
-    
+
     public function it_can_change_sms()
     {
         $this->setSmsNumber('12345678');
@@ -94,5 +94,4 @@ public function it_can_remove_sms()
         $this->unsetSmsNumber();
         $this->getSmsNumber()->shouldBe(null);
     }
-
 }
diff --git a/src/Analytics/Row.php b/src/Analytics/Row.php
@@ -51,6 +51,7 @@ public function offsetGet($offset): mixed
         if (isset($this->byHeader[$offset])) {
             return $this->byHeader[$offset];
         }
+
         return null;
     }
 
diff --git a/src/Client.php b/src/Client.php
@@ -3,6 +3,7 @@
 namespace Scriptotek\Alma;
 
 use Danmichaelo\QuiteSimpleXMLElement\QuiteSimpleXMLElement;
+use function GuzzleHttp\Psr7\stream_for;
 use Http\Client\Common\Plugin\ContentLengthPlugin;
 use Http\Client\Common\Plugin\ErrorPlugin;
 use Http\Client\Common\PluginClient;
@@ -34,7 +35,6 @@
 use Scriptotek\Alma\TaskLists\TaskLists;
 use Scriptotek\Alma\Users\Users;
 use Scriptotek\Sru\Client as SruClient;
-use function GuzzleHttp\Psr7\stream_for;
 
 /**
  * Alma client.
@@ -220,7 +220,9 @@ public function setKey($key)
      * Set the Alma region code ('na' for North America, 'eu' for Europe, 'ap' for Asia Pacific).
      *
      * @param $regionCode
+     *
      * @throws AlmaClientException
+     *
      * @return $this
      */
     public function setRegion($regionCode)
@@ -237,6 +239,7 @@ public function setRegion($regionCode)
      * Set the Alma API base url.
      *
      * @param string $url
+     *
      * @return $this
      */
     public function setEntryPoint(string $url)
@@ -250,6 +253,7 @@ public function setEntryPoint(string $url)
      * Set extra request headers.
      *
      * @param array $headers
+     *
      * @return $this
      */
     public function setExtraHeaders(array $headers)
diff --git a/src/Conf/Conf.php b/src/Conf/Conf.php
@@ -3,7 +3,6 @@
 namespace Scriptotek\Alma\Conf;
 
 use Scriptotek\Alma\Client;
-use Scriptotek\Alma\Conf\Jobs;
 
 class Conf
 {
diff --git a/src/Conf/Job.php b/src/Conf/Job.php
@@ -4,7 +4,6 @@
 
 use Scriptotek\Alma\Client;
 use Scriptotek\Alma\Model\LazyResource;
-use Scriptotek\Alma\Conf\JobInstances;
 
 /**
  * A single Job resource.
@@ -31,13 +30,13 @@ public function __construct(Client $client, string $job_id)
     }
 
     /**
-     * Submit the job for running
+     * Submit the job for running.
      *
      * @return string The API response body
      */
     public function submit()
     {
-        return $this->client->post($this->url().'?op=run', json_encode($this->jsonSerialize()));
+        return $this->client->post($this->url() . '?op=run', json_encode($this->jsonSerialize()));
     }
 
     /**
diff --git a/src/Conf/JobInstance.php b/src/Conf/JobInstance.php
@@ -20,7 +20,7 @@ class JobInstance extends LazyResource
      * JobInstance constructor.
      *
      * @param Client $client
-     * @param Job $job
+     * @param Job    $job
      * @param string $job_instance_id
      */
     public function __construct(Client $client, Job $job, string $job_instance_id)
diff --git a/src/Conf/JobInstances.php b/src/Conf/JobInstances.php
@@ -4,9 +4,8 @@
 
 use Scriptotek\Alma\Client;
 use Scriptotek\Alma\Model\IterableCollection;
-use Scriptotek\Alma\Model\SimplePaginatedList;
 use Scriptotek\Alma\Model\ReadOnlyArrayAccess;
-use Scriptotek\Alma\Conf\JobInstance;
+use Scriptotek\Alma\Model\SimplePaginatedList;
 
 /**
  * Iterable collection of Job Instances.
@@ -23,7 +22,7 @@ class JobInstances extends SimplePaginatedList implements \ArrayAccess, \Countab
      * Job Instances constructor.
      *
      * @param Client $client
-     * @param Job $job
+     * @param Job    $job
      */
     public function __construct(Client $client, Job $job)
     {
diff --git a/src/Conf/Jobs.php b/src/Conf/Jobs.php
@@ -4,9 +4,8 @@
 
 use Scriptotek\Alma\Client;
 use Scriptotek\Alma\Model\PaginatedListGenerator;
-use Scriptotek\Alma\Model\SimplePaginatedList;
 use Scriptotek\Alma\Model\ReadOnlyArrayAccess;
-use Scriptotek\Alma\Conf\Job;
+use Scriptotek\Alma\Model\SimplePaginatedList;
 
 /**
  * Iterable collection of Jobs.
diff --git a/src/Users/User.php b/src/Users/User.php
@@ -98,9 +98,10 @@ public function getSmsNumber()
                 }
             }
         }
+
         return null;
     }
- 
+
     /**
      * Remove the preferred SMS flag from any number.
      */
@@ -117,7 +118,8 @@ public function unsetSmsNumber()
     }
 
     /**
-     * Set the user's preferred SMS number, creating a new internal mobile number if needed
+     * Set the user's preferred SMS number, creating a new internal mobile number if needed.
+     *
      * @param $number string The SMS-capable mobile phone number
      */
     public function setSmsNumber($number)
@@ -142,6 +144,7 @@ public function setSmsNumber($number)
 
     /**
      * Add the user's preferred SMS number as a new internal mobile number.
+     *
      * @param $number string The SMS-capable mobile phone number
      */
     public function addSmsNumber($number)
@@ -151,18 +154,19 @@ public function addSmsNumber($number)
             $this->unsetSmsNumber();
         }
         $phones = json_decode(json_encode($this->data->contact_info->phone), true);
-        $phones[] = json_decode('{"phone_number":'.json_encode($number).',"preferred":false,"preferred_sms":true,"segment_type":"Internal","phone_type":[{"value":"mobile","desc":"Mobile"}]}', true);
+        $phones[] = json_decode('{"phone_number":' . json_encode($number) . ',"preferred":false,"preferred_sms":true,"segment_type":"Internal","phone_type":[{"value":"mobile","desc":"Mobile"}]}', true);
         $this->data->contact_info->phone = json_decode(json_encode($phones));
     }
 
     /**
-     * Save the user
-     * 
+     * Save the user.
+     *
      * @return string The API response body
      */
     public function save()
     {
         $this->init();
+
         return $this->client->put($this->url(), json_encode($this->jsonSerialize()));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public function it_can_be_configured_with_custom_base_url()`
`35`	`35`	`$this->entrypoint->shouldBe('http://proxy.foxy');`
`36`	`36`	`}`
`37`	`37`
`38`		`-`
`39`	`38`	`protected function httpWithResponseBody($body, $statusCode = 200, $headers = [])`
`40`	`39`	`{`
`41`	`40`	`$http = $this->let();`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ public function it_should_belong_to_a_job()`
`25`	`25`	`{`
`26`	`26`	`$this->job->shouldBeAnInstanceOf(Job::class);`
`27`	`27`	`}`
`28`		`-}`
	`28`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function it_has_sms()`
`76`	`76`	`{`
`77`	`77`	`$this->getSmsNumber()->shouldBe('87654321');`
`78`	`78`	`}`
`79`		`-`
	`79`	`+`
`80`	`80`	`public function it_can_change_sms()`
`81`	`81`	`{`
`82`	`82`	`$this->setSmsNumber('12345678');`
`@@ -94,5 +94,4 @@ public function it_can_remove_sms()`
`94`	`94`	`$this->unsetSmsNumber();`
`95`	`95`	`$this->getSmsNumber()->shouldBe(null);`
`96`	`96`	`}`
`97`		`-`
`98`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ public function offsetGet($offset): mixed`
`51`	`51`	`if (isset($this->byHeader[$offset])) {`
`52`	`52`	`return $this->byHeader[$offset];`
`53`	`53`	`}`
	`54`	`+`
`54`	`55`	`return null;`
`55`	`56`	`}`
`56`	`57`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`namespace Scriptotek\Alma\Conf;`
`4`	`4`
`5`	`5`	`use Scriptotek\Alma\Client;`
`6`		`-use Scriptotek\Alma\Conf\Jobs;`
`7`	`6`
`8`	`7`	`class Conf`
`9`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use Scriptotek\Alma\Client;`
`6`	`6`	`use Scriptotek\Alma\Model\LazyResource;`
`7`		`-use Scriptotek\Alma\Conf\JobInstances;`
`8`	`7`
`9`	`8`	`/**`
`10`	`9`	`* A single Job resource.`
`@@ -31,13 +30,13 @@ public function __construct(Client $client, string $job_id)`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`/**`
`34`		`- * Submit the job for running`
	`33`	`+ * Submit the job for running.`
`35`	`34`	`*`
`36`	`35`	`* @return string The API response body`
`37`	`36`	`*/`
`38`	`37`	`public function submit()`
`39`	`38`	`{`
`40`		`- return $this->client->post($this->url().'?op=run', json_encode($this->jsonSerialize()));`
	`39`	`+ return $this->client->post($this->url() . '?op=run', json_encode($this->jsonSerialize()));`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`/**`