Apply fixes from StyleCI

danmichaelo · danmichaelo · commit c8f64f2c91b1 · 2019-04-08T23:10:31.000+02:00
diff --git a/spec/Bibs/ElectronicCollectionsSpec.php b/spec/Bibs/ElectronicCollectionsSpec.php
@@ -2,11 +2,10 @@
 
 namespace spec\Scriptotek\Alma\Bibs;
 
+use PhpSpec\ObjectBehavior;
 use Scriptotek\Alma\Bibs\Bib;
 use Scriptotek\Alma\Bibs\ElectronicCollections;
 use Scriptotek\Alma\Client as AlmaClient;
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Scriptotek\Alma\Electronic\Collection;
 use spec\Scriptotek\Alma\SpecHelper;
 
@@ -18,7 +17,7 @@ public function let(AlmaClient $client, Bib $bib)
         $this->beConstructedWith($client, $bib);
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType(ElectronicCollections::class);
     }
diff --git a/spec/Bibs/FileSpec.php b/spec/Bibs/FileSpec.php
@@ -2,12 +2,11 @@
 
 namespace spec\Scriptotek\Alma\Bibs;
 
+use PhpSpec\ObjectBehavior;
 use Scriptotek\Alma\Bibs\Bib;
-use Scriptotek\Alma\Bibs\Representation;
 use Scriptotek\Alma\Bibs\File;
+use Scriptotek\Alma\Bibs\Representation;
 use Scriptotek\Alma\Client as AlmaClient;
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 class FileSpec extends ObjectBehavior
 {
@@ -24,5 +23,4 @@ public function it_is_initializable()
     {
         $this->shouldHaveType(File::class);
     }
-
 }
diff --git a/spec/Bibs/FilesSpec.php b/spec/Bibs/FilesSpec.php
@@ -2,12 +2,11 @@
 
 namespace spec\Scriptotek\Alma\Bibs;
 
+use PhpSpec\ObjectBehavior;
 use Scriptotek\Alma\Bibs\Bib;
-use Scriptotek\Alma\Bibs\Representation;
 use Scriptotek\Alma\Bibs\Files;
+use Scriptotek\Alma\Bibs\Representation;
 use Scriptotek\Alma\Client as AlmaClient;
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use spec\Scriptotek\Alma\SpecHelper;
 
 class FilesSpec extends ObjectBehavior
diff --git a/spec/Bibs/PortfolioSpec.php b/spec/Bibs/PortfolioSpec.php
@@ -3,7 +3,6 @@
 namespace spec\Scriptotek\Alma\Bibs;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Scriptotek\Alma\Bibs\Bib;
 use Scriptotek\Alma\Bibs\Portfolio;
 use Scriptotek\Alma\Bibs\Portfolios;
@@ -20,7 +19,7 @@ public function let(AlmaClient $client, Bib $bib)
         $this->beConstructedWith($client, $bib, $portfolio_id);
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType(Portfolio::class);
     }
@@ -45,4 +44,5 @@ public function it_belongs_to_collection(AlmaClient $client)
 
         $this->getElectronicCollection()->shouldHaveType(Collection::class);
         $this->electronic_collection->shouldHaveType(Collection::class);
-    }}
+    }
+}
diff --git a/spec/Bibs/PortfoliosSpec.php b/spec/Bibs/PortfoliosSpec.php
@@ -3,9 +3,7 @@
 namespace spec\Scriptotek\Alma\Bibs;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Scriptotek\Alma\Bibs\Bib;
-use Scriptotek\Alma\Bibs\Portfolio;
 use Scriptotek\Alma\Bibs\Portfolios;
 use Scriptotek\Alma\Client as AlmaClient;
 use spec\Scriptotek\Alma\SpecHelper;
@@ -18,7 +16,7 @@ public function let(AlmaClient $client, Bib $bib)
         $this->beConstructedWith($client, $bib);
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType(Portfolios::class);
     }
diff --git a/spec/Bibs/RepresentationSpec.php b/spec/Bibs/RepresentationSpec.php
@@ -2,13 +2,12 @@
 
 namespace spec\Scriptotek\Alma\Bibs;
 
+use PhpSpec\ObjectBehavior;
 use Scriptotek\Alma\Bibs\Bib;
 use Scriptotek\Alma\Bibs\File;
-use Scriptotek\Alma\Bibs\Representations;
 use Scriptotek\Alma\Bibs\Representation;
+use Scriptotek\Alma\Bibs\Representations;
 use Scriptotek\Alma\Client as AlmaClient;
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use spec\Scriptotek\Alma\SpecHelper;
 
 class RepresentationSpec extends ObjectBehavior
@@ -52,5 +51,4 @@ public function it_has_files(AlmaClient $client)
         $files->valid()->shouldBe(true);
         $files->current()->shouldHaveType(File::class);
     }
-
 }
diff --git a/spec/Bibs/RepresentationsSpec.php b/spec/Bibs/RepresentationsSpec.php
@@ -2,11 +2,10 @@
 
 namespace spec\Scriptotek\Alma\Bibs;
 
+use PhpSpec\ObjectBehavior;
 use Scriptotek\Alma\Bibs\Bib;
 use Scriptotek\Alma\Bibs\Representations;
 use Scriptotek\Alma\Client as AlmaClient;
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use spec\Scriptotek\Alma\SpecHelper;
 
 class RepresentationsSpec extends ObjectBehavior
@@ -17,7 +16,7 @@ public function let(AlmaClient $client, Bib $bib)
         $this->beConstructedWith($client, $bib);
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType(Representations::class);
     }
diff --git a/spec/Electronic/CollectionSpec.php b/spec/Electronic/CollectionSpec.php
@@ -3,8 +3,8 @@
 namespace spec\Scriptotek\Alma\Electronic;
 
 use PhpSpec\ObjectBehavior;
-use Scriptotek\Alma\Electronic\Collection;
 use Scriptotek\Alma\Client as AlmaClient;
+use Scriptotek\Alma\Electronic\Collection;
 use spec\Scriptotek\Alma\SpecHelper;
 
 class CollectionSpec extends ObjectBehavior
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
 {
@@ -40,8 +40,7 @@ public static function makeExceptionResponse(
         $code = 400,
         $contentType = 'application/json;charset=utf-8',
         $cls = ClientErrorException::class
-    )
-    {
+    ) {
         $requestFactory = new RequestFactory();
         $responseFactory = new ResponseFactory();
 
@@ -52,7 +51,5 @@ public static function makeExceptionResponse(
                 ->withHeader('Content-Type', $contentType)
                 ->withBody(stream_for($body))
         );
-
-
     }
 }
diff --git a/spec/Users/UsersSpec.php b/spec/Users/UsersSpec.php
@@ -2,14 +2,11 @@
 
 namespace spec\Scriptotek\Alma\Users;
 
-use Http\Mock\Client as MockHttp;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Scriptotek\Alma\Client as AlmaClient;
-use Scriptotek\Alma\Exception\RequestFailed;
 use Scriptotek\Alma\Users\User;
 use Scriptotek\Alma\Users\Users;
-use Scriptotek\Alma\Zones;
 use spec\Scriptotek\Alma\SpecHelper;
 
 class UsersSpec extends ObjectBehavior
diff --git a/src/Bibs/File.php b/src/Bibs/File.php
@@ -22,8 +22,8 @@ class File extends LazyResource
     /**
      * File constructor.
      *
-     * @param Client  $client
-     * @param Bib     $bib
+     * @param Client         $client
+     * @param Bib            $bib
      * @param Representation $representation
      * @param $file_id
      */
diff --git a/src/Bibs/Files.php b/src/Bibs/Files.php
@@ -32,8 +32,8 @@ class Files extends LazyResourceList implements \Countable, \Iterator, \ArrayAcc
     /**
      * Files constructor.
      *
-     * @param Client  $client
-     * @param Bib     $bib
+     * @param Client         $client
+     * @param Bib            $bib
      * @param Representation $representation
      */
     public function __construct(Client $client, Bib $bib = null, Representation $representation = null)
diff --git a/src/Bibs/Portfolio.php b/src/Bibs/Portfolio.php
@@ -2,7 +2,6 @@
 
 namespace Scriptotek\Alma\Bibs;
 
-use Scriptotek\Alma\Bibs\Bib;
 use Scriptotek\Alma\Client;
 use Scriptotek\Alma\Electronic\Collection;
 use Scriptotek\Alma\Model\LazyResource;
diff --git a/src/Bibs/Portfolios.php b/src/Bibs/Portfolios.php
@@ -2,9 +2,7 @@
 
 namespace Scriptotek\Alma\Bibs;
 
-use Scriptotek\Alma\Bibs\Bib;
 use Scriptotek\Alma\Client;
-use Scriptotek\Alma\Bibs\Portfolio;
 use Scriptotek\Alma\Model\IterableCollection;
 use Scriptotek\Alma\Model\LazyResourceList;
 use Scriptotek\Alma\Model\ReadOnlyArrayAccess;
diff --git a/src/Client.php b/src/Client.php
@@ -3,7 +3,6 @@
 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;
@@ -33,6 +32,7 @@
 use Scriptotek\Alma\TaskLists\TaskLists;
 use Scriptotek\Alma\Users\Users;
 use Scriptotek\Sru\Client as SruClient;
+use function GuzzleHttp\Psr7\stream_for;
 
 /**
  * Alma client.

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace spec\Scriptotek\Alma\Bibs;`
`4`	`4`
	`5`	`+use PhpSpec\ObjectBehavior;`
`5`	`6`	`use Scriptotek\Alma\Bibs\Bib;`
`6`	`7`	`use Scriptotek\Alma\Bibs\ElectronicCollections;`
`7`	`8`	`use Scriptotek\Alma\Client as AlmaClient;`
`8`		`-use PhpSpec\ObjectBehavior;`
`9`		`-use Prophecy\Argument;`
`10`	`9`	`use Scriptotek\Alma\Electronic\Collection;`
`11`	`10`	`use spec\Scriptotek\Alma\SpecHelper;`
`12`	`11`
`@@ -18,7 +17,7 @@ public function let(AlmaClient $client, Bib $bib)`
`18`	`17`	`$this->beConstructedWith($client, $bib);`
`19`	`18`	`}`
`20`	`19`
`21`		`- function it_is_initializable()`
	`20`	`+ public function it_is_initializable()`
`22`	`21`	`{`
`23`	`22`	`$this->shouldHaveType(ElectronicCollections::class);`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace spec\Scriptotek\Alma\Bibs;`
`4`	`4`
	`5`	`+use PhpSpec\ObjectBehavior;`
`5`	`6`	`use Scriptotek\Alma\Bibs\Bib;`
`6`		`-use Scriptotek\Alma\Bibs\Representation;`
`7`	`7`	`use Scriptotek\Alma\Bibs\File;`
	`8`	`+use Scriptotek\Alma\Bibs\Representation;`
`8`	`9`	`use Scriptotek\Alma\Client as AlmaClient;`
`9`		`-use PhpSpec\ObjectBehavior;`
`10`		`-use Prophecy\Argument;`
`11`	`10`
`12`	`11`	`class FileSpec extends ObjectBehavior`
`13`	`12`	`{`
`@@ -24,5 +23,4 @@ public function it_is_initializable()`
`24`	`23`	`{`
`25`	`24`	`$this->shouldHaveType(File::class);`
`26`	`25`	`}`
`27`		`-`
`28`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`namespace spec\Scriptotek\Alma\Bibs;`
`4`	`4`
`5`	`5`	`use PhpSpec\ObjectBehavior;`
`6`		`-use Prophecy\Argument;`
`7`	`6`	`use Scriptotek\Alma\Bibs\Bib;`
`8`	`7`	`use Scriptotek\Alma\Bibs\Portfolio;`
`9`	`8`	`use Scriptotek\Alma\Bibs\Portfolios;`
`@@ -20,7 +19,7 @@ public function let(AlmaClient $client, Bib $bib)`
`20`	`19`	`$this->beConstructedWith($client, $bib, $portfolio_id);`
`21`	`20`	`}`
`22`	`21`
`23`		`- function it_is_initializable()`
	`22`	`+ public function it_is_initializable()`
`24`	`23`	`{`
`25`	`24`	`$this->shouldHaveType(Portfolio::class);`
`26`	`25`	`}`
`@@ -45,4 +44,5 @@ public function it_belongs_to_collection(AlmaClient $client)`
`45`	`44`
`46`	`45`	`$this->getElectronicCollection()->shouldHaveType(Collection::class);`
`47`	`46`	`$this->electronic_collection->shouldHaveType(Collection::class);`
`48`		`- }}`
	`47`	`+ }`
	`48`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@`
`3`	`3`	`namespace spec\Scriptotek\Alma\Bibs;`
`4`	`4`
`5`	`5`	`use PhpSpec\ObjectBehavior;`
`6`		`-use Prophecy\Argument;`
`7`	`6`	`use Scriptotek\Alma\Bibs\Bib;`
`8`		`-use Scriptotek\Alma\Bibs\Portfolio;`
`9`	`7`	`use Scriptotek\Alma\Bibs\Portfolios;`
`10`	`8`	`use Scriptotek\Alma\Client as AlmaClient;`
`11`	`9`	`use spec\Scriptotek\Alma\SpecHelper;`
`@@ -18,7 +16,7 @@ public function let(AlmaClient $client, Bib $bib)`
`18`	`16`	`$this->beConstructedWith($client, $bib);`
`19`	`17`	`}`
`20`	`18`
`21`		`- function it_is_initializable()`
	`19`	`+ public function it_is_initializable()`
`22`	`20`	`{`
`23`	`21`	`$this->shouldHaveType(Portfolios::class);`
`24`	`22`	`}`