From 621049e3fc7d87655fbabf77f3ace612d2b3e503 Mon Sep 17 00:00:00 2001 From: Demian Katz <demian.katz@villanova.edu> Date: Mon, 9 Mar 2015 14:49:33 -0400 Subject: [PATCH] phpcbf --- .../VuDLTest/Connection/AbstractBaseTest.php | 25 ++++- .../src/VuDLTest/Connection/ManagerTest.php | 3 +- .../src/VuDLTest/Connection/SolrTest.php | 6 +- .../src/VuFind/Route/RouteGenerator.php | 2 +- .../View/Helper/Root/ResultFeedTest.php | 3 +- .../src/VuFindTest/Auth/ChoiceAuthTest.php | 6 +- .../src/VuFindTest/Auth/DatabaseUnitTest.php | 12 +-- .../src/VuFindTest/Auth/ManagerTest.php | 12 +-- .../src/VuFindTest/Auth/PluginManagerTest.php | 2 +- .../Autocomplete/PluginManagerTest.php | 2 +- .../src/VuFindTest/Autocomplete/TagTest.php | 2 +- .../Config/Reader/CacheDecoratorTest.php | 14 +-- .../Content/AuthorNotes/PluginManagerTest.php | 2 +- .../Content/Covers/PluginManagerTest.php | 2 +- .../Content/Excerpts/PluginManagerTest.php | 2 +- .../VuFindTest/Content/PluginManagerTest.php | 2 +- .../Content/Reviews/PluginManagerTest.php | 2 +- .../Controller/Plugin/ResultScrollerTest.php | 2 +- .../src/VuFindTest/Cover/LoaderTest.php | 2 +- .../VuFindTest/Db/Table/PluginManagerTest.php | 2 +- .../src/VuFindTest/Harvester/OAITest.php | 5 +- .../Hierarchy/Driver/PluginManagerTest.php | 2 +- .../TreeDataSource/PluginManagerTest.php | 2 +- .../TreeRenderer/PluginManagerTest.php | 2 +- .../Translator/Loader/ExtendedIniTest.php | 2 +- .../ILS/Driver/MultiBackendTest.php | 2 +- .../ILS/Driver/PluginManagerTest.php | 2 +- .../src/VuFindTest/Mailer/MailerTest.php | 10 +- .../src/VuFindTest/QRCode/LoaderTest.php | 8 +- .../VuFindTest/Recommend/FacetCloudTest.php | 2 +- .../Recommend/PluginManagerTest.php | 2 +- .../Recommend/RandomRecommendTest.php | 27 +++--- .../VuFindTest/Recommend/SideFacetsTest.php | 4 +- .../src/VuFindTest/Record/LoaderTest.php | 2 +- .../RecordDriver/PluginManagerTest.php | 2 +- .../RecordTab/PluginManagerTest.php | 2 +- .../VuFindTest/Related/PluginManagerTest.php | 2 +- .../src/VuFindTest/Reserves/CsvReaderTest.php | 2 +- .../Resolver/Driver/PluginManagerTest.php | 2 +- .../PermissionProvider/PluginManagerTest.php | 2 +- .../src/VuFindTest/SMS/ClickatellTest.php | 6 +- .../VuFindTest/Search/BackendManagerTest.php | 4 +- .../Search/Options/PluginManagerTest.php | 2 +- .../Search/Params/PluginManagerTest.php | 2 +- .../Search/Results/PluginManagerTest.php | 2 +- .../Search/Solr/SpellingProcessorTest.php | 2 +- .../VuFindTest/Session/PluginManagerTest.php | 2 +- .../Statistics/Driver/PluginManagerTest.php | 2 +- .../View/Helper/Root/CitationTest.php | 5 +- .../View/Helper/Root/RecordTest.php | 4 +- .../Controller/GenerateController.php | 2 +- .../tests/unit-tests/bootstrap.php | 2 +- .../tests/unit-tests/bootstrap.php | 2 +- .../Response/RecordCollectionFactoryTest.php | 10 +- .../XML/RecordCollectionFactoryTest.php | 10 +- .../Backend/LibGuides/BackendTest.php | 22 ++--- .../Response/RecordCollectionFactoryTest.php | 2 +- .../VuFindTest/Backend/Primo/BackendTest.php | 14 +-- .../Response/RecordCollectionFactoryTest.php | 4 +- .../VuFindTest/Backend/Solr/BackendTest.php | 12 +-- .../VuFindTest/Backend/Solr/ConnectorTest.php | 2 +- .../Solr/Document/UpdateDocumentTest.php | 4 +- .../Backend/Solr/HandlerMapTest.php | 10 +- .../Json/RecordCollectionFactoryTest.php | 2 +- .../VuFindTest/Backend/Summon/BackendTest.php | 14 +-- .../Response/RecordCollectionFactoryTest.php | 10 +- .../XML/RecordCollectionFactoryTest.php | 4 +- .../src/VuFindTest/Query/QueryGroupTest.php | 2 +- .../src/VuFindTest/SearchServiceTest.php | 92 ++++++++++--------- .../tests/unit-tests/bootstrap.php | 2 +- .../src/VuFindTest/ThemeInfoTest.php | 2 +- 71 files changed, 239 insertions(+), 205 deletions(-) diff --git a/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/AbstractBaseTest.php b/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/AbstractBaseTest.php index ae5dd3e2e01..a93ff25268c 100644 --- a/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/AbstractBaseTest.php +++ b/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/AbstractBaseTest.php @@ -47,9 +47,24 @@ class AbstractBaseTest extends \VuFindTest\Unit\TestCase class FakeInterface implements \VuFindHttp\HttpServiceInterface { - public function proxify(\Zend\Http\Client $client, array $options = []) {} - public function get($url, array $params = [], $timeout = null) {} - public function post($url, $body = null, $type = 'application/octet-stream', $timeout = null) {} - public function postForm($url, array $params = [], $timeout = null) {} - public function createClient($url, $method = \Zend\Http\Request::METHOD_GET, $timeout = null) {} + public function proxify(\Zend\Http\Client $client, array $options = []) + { + + } + public function get($url, array $params = [], $timeout = null) + { + + } + public function post($url, $body = null, $type = 'application/octet-stream', $timeout = null) + { + + } + public function postForm($url, array $params = [], $timeout = null) + { + + } + public function createClient($url, $method = \Zend\Http\Request::METHOD_GET, $timeout = null) + { + + } } \ No newline at end of file diff --git a/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/ManagerTest.php b/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/ManagerTest.php index 471731009a5..1f7ff215a3e 100644 --- a/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/ManagerTest.php +++ b/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/ManagerTest.php @@ -88,7 +88,8 @@ class ManagerTest extends \VuFindTest\Unit\TestCase class FakeServiceLocator { - public function get($class) { + public function get($class) + { if($class == "VuDL\\Connection\\First") { return new First(); } else { diff --git a/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/SolrTest.php b/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/SolrTest.php index 24797285952..564625c6762 100644 --- a/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/SolrTest.php +++ b/module/VuDL/tests/unit-tests/src/VuDLTest/Connection/SolrTest.php @@ -106,11 +106,13 @@ class SolrTest extends \VuFindTest\Unit\TestCase $this->assertEquals(null, $subject->getDetails('id', false)); $this->assertEquals(["author" => ["A1","A2"],"series" => "S1"], $subject->getDetails('id', false)); - $this->assertEquals([ + $this->assertEquals( + [ "author" => ["title" => "Author", "value" => ["A1","A2"]], "bacon" => ["title" => "Yum", "value" => ["MORE"]], "series" => ["title" => "Series", "value" => "S1"], - ], $subject->getDetails('id', true)); + ], $subject->getDetails('id', true) + ); $this->assertEquals(null, $subject->getLabel('id')); $this->assertEquals("LABEL", $subject->getLabel('id')); diff --git a/module/VuFind/src/VuFind/Route/RouteGenerator.php b/module/VuFind/src/VuFind/Route/RouteGenerator.php index 3ef398b365e..74273e5b71c 100644 --- a/module/VuFind/src/VuFind/Route/RouteGenerator.php +++ b/module/VuFind/src/VuFind/Route/RouteGenerator.php @@ -116,7 +116,7 @@ class RouteGenerator /** * Add record route to the configuration. * - * @param array $config Configuration array to update + * @param array $config Configuration array to update * @param string $routeBase Base name to use for routes * @param string $controller Controller to point routes toward * diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/View/Helper/Root/ResultFeedTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/View/Helper/Root/ResultFeedTest.php index 45add6688c9..d11f6dc71d3 100644 --- a/module/VuFind/tests/integration-tests/src/VuFindTest/View/Helper/Root/ResultFeedTest.php +++ b/module/VuFind/tests/integration-tests/src/VuFindTest/View/Helper/Root/ResultFeedTest.php @@ -67,7 +67,8 @@ class ResultFeedTest extends \VuFindTest\Unit\ViewHelperTestCase 'VuFind\View\Helper\Root\RecordLink', [], [new \VuFind\Record\Router( $this->getServiceManager()->get('VuFind\RecordLoader'), - new \Zend\Config\Config([])) + new \Zend\Config\Config([]) + ) ] ); $recordLink->expects($this->any())->method('getUrl') diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ChoiceAuthTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ChoiceAuthTest.php index 2e1befc3650..4013852d975 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ChoiceAuthTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ChoiceAuthTest.php @@ -46,7 +46,7 @@ class ChoiceAuthTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException \VuFind\Exception\Auth + * @expectedException \VuFind\Exception\Auth * @expectedExceptionMessage One or more ChoiceAuth parameters are missing. */ public function testBadConfiguration() @@ -60,7 +60,7 @@ class ChoiceAuthTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException \Exception + * @expectedException \Exception * @expectedExceptionMessage Plugin manager missing. */ public function testMissingPluginManager() @@ -177,7 +177,7 @@ class ChoiceAuthTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException \Exception + * @expectedException \Exception * @expectedExceptionMessage Illegal setting: foo */ public function testIllegalMethod() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/DatabaseUnitTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/DatabaseUnitTest.php index 634b239618f..11b8251e2f4 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/DatabaseUnitTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/DatabaseUnitTest.php @@ -44,7 +44,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase * * @return void * - * @expectedException VuFind\Exception\Auth + * @expectedException VuFind\Exception\Auth * @expectedExceptionMessage Username cannot be blank */ public function testEmptyCreateRequest() @@ -58,7 +58,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase * * @return void * - * @expectedException VuFind\Exception\Auth + * @expectedException VuFind\Exception\Auth * @expectedExceptionMessage Password cannot be blank */ public function testEmptyPasswordCreateRequest() @@ -74,7 +74,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase * * @return void * - * @expectedException VuFind\Exception\Auth + * @expectedException VuFind\Exception\Auth * @expectedExceptionMessage Passwords do not match */ public function testMismatchedPasswordCreateRequest() @@ -90,7 +90,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase * * @return void * - * @expectedException Exception + * @expectedException Exception * @expectedExceptionMessage DB table manager missing. */ public function testCreateWithMissingTableManager() @@ -104,7 +104,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase * * @return void * - * @expectedException VuFind\Exception\Auth + * @expectedException VuFind\Exception\Auth * @expectedExceptionMessage That email address is already used */ public function testCreateDuplicateEmail() @@ -130,7 +130,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase * * @return void * - * @expectedException VuFind\Exception\Auth + * @expectedException VuFind\Exception\Auth * @expectedExceptionMessage That username is already taken */ public function testCreateDuplicateUsername() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ManagerTest.php index 605e60b4656..c22baefdb2a 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ManagerTest.php @@ -196,7 +196,7 @@ class ManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException \Exception + * @expectedException \Exception * @expectedExceptionMessage Illegal authentication method: MultiILS */ public function testSwitchingFailure() @@ -334,7 +334,7 @@ class ManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException \VuFind\Exception\PasswordSecurity + * @expectedException \VuFind\Exception\PasswordSecurity * @expectedExceptionMessage Boom */ public function testPasswordSecurityException() @@ -353,7 +353,7 @@ class ManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException \VuFind\Exception\Auth + * @expectedException \VuFind\Exception\Auth * @expectedExceptionMessage Blam */ public function testAuthException() @@ -372,7 +372,7 @@ class ManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException \VuFind\Exception\Auth + * @expectedException \VuFind\Exception\Auth * @expectedExceptionMessage authentication_error_technical */ public function testUnanticipatedException() @@ -477,8 +477,8 @@ class ManagerTest extends \VuFindTest\Unit\TestCase protected function getMockUserTable() { return $this->getMockBuilder('VuFind\Db\Table\User') - ->disableOriginalConstructor() - ->getMock(); + ->disableOriginalConstructor() + ->getMock(); } /** diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/PluginManagerTest.php index 5e713e201f7..c5de713c86e 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Auth\AbstractBase */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/PluginManagerTest.php index d50e417cd54..059c717b268 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Autocomplete\AutocompleteInterface */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/TagTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/TagTest.php index 34d71f2b346..b3e2175caef 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/TagTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/TagTest.php @@ -44,7 +44,7 @@ class TagTest extends \VuFindTest\Unit\DbTestCase * * @return void * - * @expectedException Exception + * @expectedException Exception * @expectedExceptionMessage DB table manager missing. */ public function testMissingDependency() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php index e1b5ccb72f4..54a188b7dcd 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php @@ -51,17 +51,17 @@ class CacheDecoratorTest extends \PHPUnit_Framework_TestCase { $cache = $this->getMockForAbstractClass('Zend\Cache\Storage\StorageInterface', ['setItem', 'hasItem']); $cache->expects($this->exactly(2)) - ->method('setItem'); + ->method('setItem'); $cache->expects($this->exactly(2)) - ->method('hasItem') - ->will($this->returnValue(false)); + ->method('hasItem') + ->will($this->returnValue(false)); $reader = $this->getMockForAbstractClass('Zend\Config\Reader\ReaderInterface', ['fromFile', 'fromString']); $reader->expects($this->once()) - ->method('fromFile') - ->will($this->returnValue([])); + ->method('fromFile') + ->will($this->returnValue([])); $reader->expects($this->once()) - ->method('fromString') - ->will($this->returnValue([])); + ->method('fromString') + ->will($this->returnValue([])); $deco = new CacheDecorator($reader, $cache); $deco->fromFile('ignore'); $deco->fromString('ignore'); diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/AuthorNotes/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/AuthorNotes/PluginManagerTest.php index e04eddd576e..e21f310ddde 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/AuthorNotes/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/AuthorNotes/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Content\AbstractBase */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/PluginManagerTest.php index 0ecd0db4e03..526e21c707e 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Content\AbstractCover */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Excerpts/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Excerpts/PluginManagerTest.php index 06584f951bf..9a9fc23af1a 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Excerpts/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Excerpts/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Content\AbstractBase */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/PluginManagerTest.php index d69ef24be53..473039920ef 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Content\Loader */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Reviews/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Reviews/PluginManagerTest.php index 8c091757d09..f3b46ce7588 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Reviews/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Reviews/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Content\AbstractBase */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Controller/Plugin/ResultScrollerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Controller/Plugin/ResultScrollerTest.php index aa4fa37938e..1bd07ea2375 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Controller/Plugin/ResultScrollerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Controller/Plugin/ResultScrollerTest.php @@ -185,7 +185,7 @@ class ResultScrollerTest extends TestCase * Get mock result scroller * * @param \VuFind\Search\Base\Results restoreLastSearch results (null to ignore) - * @param array $methods Methods to mock + * @param array $methods Methods to mock * * @return ResultScroller */ diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Cover/LoaderTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Cover/LoaderTest.php index 0564f621385..2ff4dcda750 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Cover/LoaderTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Cover/LoaderTest.php @@ -54,7 +54,7 @@ class LoaderTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Exception + * @expectedException Exception * @expectedExceptionMessage Could not load default fail image. */ public function testUtterFailure() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Db/Table/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Db/Table/PluginManagerTest.php index e52e2024201..2ee176fe073 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Db/Table/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Db/Table/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Db\Table\Gateway */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php index 4c8a2f80c8f..842966952b2 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php @@ -228,7 +228,7 @@ class OAITest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Exception + * @expectedException Exception * @expectedExceptionMessage HTTP Error */ public function testHTTPErrorDetection() @@ -246,13 +246,12 @@ class OAITest extends \VuFindTest\Unit\TestCase } /** - * /** * Test that a missing URL throws an exception. * * @return void * - * @expectedException Exception + * @expectedException Exception * @expectedExceptionMessage Missing base URL for test. */ public function testMissingURLThrowsException() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/Driver/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/Driver/PluginManagerTest.php index 9f25152fdf8..8d73bf0c7ff 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/Driver/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/Driver/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Hierarchy\Driver\AbstractBase */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeDataSource/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeDataSource/PluginManagerTest.php index 81a869accea..cbbd0a9cb53 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeDataSource/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeDataSource/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Hierarchy\TreeDataSource\AbstractBase */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeRenderer/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeRenderer/PluginManagerTest.php index 8ee9d2a4356..a58a0d4a283 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeRenderer/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeRenderer/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Hierarchy\TreeRenderer\AbstractBase */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/I18n/Translator/Loader/ExtendedIniTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/I18n/Translator/Loader/ExtendedIniTest.php index 9afec31252f..7664a4429cf 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/I18n/Translator/Loader/ExtendedIniTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/I18n/Translator/Loader/ExtendedIniTest.php @@ -157,7 +157,7 @@ class ExtendedIniTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\I18n\Exception\InvalidArgumentException + * @expectedException Zend\I18n\Exception\InvalidArgumentException * @expectedExceptionMessage Ini file 'en.ini' not found */ public function testMissingPathStack() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php index 0621f946b5d..d77535edde4 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php @@ -100,7 +100,7 @@ class MultiBackendTest extends \VuFindTest\Unit\TestCase $this->callMethod($driver, 'getLocalId', ['bad']); $this->assertEquals( 'VuFind\ILS\Driver\MultiBackend: ' - . "Could not find local id in 'bad' using '.'", + . "Could not find local id in 'bad' using '.'", $writer->events[1]['message'] ); } diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PluginManagerTest.php index 6a14d84f459..637fa794614 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\ILS\Driver\DriverInterface */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Mailer/MailerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Mailer/MailerTest.php index 772f009adde..6b85de76d84 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Mailer/MailerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Mailer/MailerTest.php @@ -63,7 +63,7 @@ class MailerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException VuFind\Exception\Mail + * @expectedException VuFind\Exception\Mail * @expectedExceptionMessage Invalid Recipient Email Address */ public function testBadTo() @@ -78,7 +78,7 @@ class MailerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException VuFind\Exception\Mail + * @expectedException VuFind\Exception\Mail * @expectedExceptionMessage Invalid Recipient Email Address */ public function testEmptyTo() @@ -93,7 +93,7 @@ class MailerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException VuFind\Exception\Mail + * @expectedException VuFind\Exception\Mail * @expectedExceptionMessage Too Many Email Recipients */ public function testTooManyRecipients() @@ -108,7 +108,7 @@ class MailerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException VuFind\Exception\Mail + * @expectedException VuFind\Exception\Mail * @expectedExceptionMessage Invalid Sender Email Address */ public function testBadFrom() @@ -123,7 +123,7 @@ class MailerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException VuFind\Exception\Mail + * @expectedException VuFind\Exception\Mail * @expectedExceptionMessage Boom */ public function testTransportException() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/QRCode/LoaderTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/QRCode/LoaderTest.php index e8c846ff292..0de39c5890d 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/QRCode/LoaderTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/QRCode/LoaderTest.php @@ -53,7 +53,7 @@ class LoaderTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Exception + * @expectedException Exception * @expectedExceptionMessage Could not load default fail image. */ public function testUtterFailure() @@ -80,9 +80,9 @@ class LoaderTest extends \VuFindTest\Unit\TestCase /** * Get a loader object to test. * - * @param array $config Configuration - * @param ThemeInfo $theme Theme info object (null to create default) - * @param array|bool $mock Array of functions to mock, or false for real object + * @param array $config Configuration + * @param ThemeInfo $theme Theme info object (null to create default) + * @param array|bool $mock Array of functions to mock, or false for real object * * @return void */ diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/FacetCloudTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/FacetCloudTest.php index d81fc758bae..3688a29c500 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/FacetCloudTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/FacetCloudTest.php @@ -49,7 +49,7 @@ class FacetCloudTest extends \VuFindTest\Unit\TestCase $results = $this->getMockResults(); $results->getParams()->expects($this->once())->method('getFacetSettings') ->will($this->returnValue(['limit' => 50])); - $fc = $this->getFacetCloud(null,$results); + $fc = $this->getFacetCloud(null, $results); $this->assertEquals(49, $fc->getFacetLimit()); } diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/PluginManagerTest.php index 7a031823ffc..025cef558af 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Recommend\RecommendInterface */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/RandomRecommendTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/RandomRecommendTest.php index 591ab795961..81d74f25456 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/RandomRecommendTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/RandomRecommendTest.php @@ -179,9 +179,10 @@ class RandomRecommendTest extends TestCase $paramManager->expects($this->once())->method('get') ->with($this->equalTo("Solr")) - ->will($this->returnValue( - $this->getServiceManager()->get('VuFind\SearchParamsPluginManager') - ->get('Solr') + ->will( + $this->returnValue( + $this->getServiceManager()->get('VuFind\SearchParamsPluginManager') + ->get('Solr') ) ); @@ -225,11 +226,11 @@ class RandomRecommendTest extends TestCase ->will($this->returnValue($records)); $service->expects($this->once())->method('random') - ->with( - $this->equalTo("Solr"), - $this->equalTo($params->getQuery()), - $this->equalTo(10) - )->will($this->returnValue($results)); + ->with( + $this->equalTo("Solr"), + $this->equalTo($params->getQuery()), + $this->equalTo(10) + )->will($this->returnValue($results)); $recommend->setConfig("Solr:10:mixed:retain:20:facet1:value1:facet2:value2"); $recommend->init($params, $request); @@ -263,11 +264,11 @@ class RandomRecommendTest extends TestCase ->will($this->returnValue($records)); $service->expects($this->once())->method('random') - ->with( - $this->equalTo("Solr"), - $this->equalTo($params->getQuery()), - $this->equalTo(10) - )->will($this->returnValue($results)); + ->with( + $this->equalTo("Solr"), + $this->equalTo($params->getQuery()), + $this->equalTo(10) + )->will($this->returnValue($results)); $recommend->setConfig("Solr:10:mixed:retain:0:facet1:value1:facet2:value2"); $recommend->init($params, $request); diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php index 231ff2a6f47..8204234ad31 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php @@ -76,7 +76,7 @@ class SideFacetsTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Exception + * @expectedException Exception * @expectedExceptionMessage VuFind\Recommend\SideFacets: hierarchical facet helper unavailable */ public function testMissingHierarchicalFacetHelper() @@ -266,7 +266,7 @@ class SideFacetsTest extends \VuFindTest\Unit\TestCase 'Results' => [ 'format' => 'Format', ], - 'Results_Settings' => ['collapsedFacets' => '*'], + 'Results_Settings' => ['collapsedFacets' => '*'], ]; $filters = [ 'format' => [ diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Record/LoaderTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Record/LoaderTest.php index 3478a91304d..4038b4d82be 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Record/LoaderTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Record/LoaderTest.php @@ -51,7 +51,7 @@ class LoaderTest extends TestCase * * @return void * - * @expectedException VuFind\Exception\RecordMissing + * @expectedException VuFind\Exception\RecordMissing * @expectedExceptionMessage Record VuFind:test does not exist. */ public function testMissingRecord() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/RecordDriver/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/RecordDriver/PluginManagerTest.php index c8a840fc4c1..7b808220dd1 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/RecordDriver/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/RecordDriver/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\RecordDriver\AbstractBase */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/RecordTab/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/RecordTab/PluginManagerTest.php index f578c59e424..07a35b79134 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/RecordTab/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/RecordTab/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\RecordTab\TabInterface */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Related/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Related/PluginManagerTest.php index ed598804f01..0dad2c7cc84 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Related/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Related/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Related\RelatedInterface */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Reserves/CsvReaderTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Reserves/CsvReaderTest.php index ce9640c5def..cf8f944876e 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Reserves/CsvReaderTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Reserves/CsvReaderTest.php @@ -136,7 +136,7 @@ class CsvReaderTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException \Exception + * @expectedException \Exception * @expectedExceptionMessage Could not find valid data. Details: */ public function testEmptyFile() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/PluginManagerTest.php index 23659e16dfb..b377ba97ac9 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Resolver\Driver\DriverInterface */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/PluginManagerTest.php index 093633390d4..56f375d448d 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Role\PermissionProvider\PermissionProviderInterface */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/SMS/ClickatellTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/SMS/ClickatellTest.php index d2dfe5a17c1..b39e0e7ee87 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/SMS/ClickatellTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/SMS/ClickatellTest.php @@ -92,7 +92,7 @@ class ClickatellTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException VuFind\Exception\Mail + * @expectedException VuFind\Exception\Mail * @expectedExceptionMessage badbadbad */ public function testUnexpectedResponse() @@ -114,7 +114,7 @@ class ClickatellTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException VuFind\Exception\Mail + * @expectedException VuFind\Exception\Mail * @expectedExceptionMessage Problem sending text. */ public function testFailureResponse() @@ -135,7 +135,7 @@ class ClickatellTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException VuFind\Exception\Mail + * @expectedException VuFind\Exception\Mail * @expectedExceptionMessage Foo */ public function testClientException() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php index ad34a6d0837..34405675867 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php @@ -49,7 +49,7 @@ class BackendManagerTest extends TestCase * * @return void * - * @expectedException UnexpectedValueException + * @expectedException UnexpectedValueException * @expectedExceptionMessage Expected backend registry to return object */ public function testGetThrowsOnNonObject() @@ -67,7 +67,7 @@ class BackendManagerTest extends TestCase * * @return void * - * @expectedException UnexpectedValueException + * @expectedException UnexpectedValueException * @expectedExceptionMessage does not implement the expected interface */ public function testGetThrowsOnNonBackend() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Options/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Options/PluginManagerTest.php index e2885ff0446..21d999f9768 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Options/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Options/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Search\Base\Options */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Params/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Params/PluginManagerTest.php index 24386016d94..7b4190c6ea4 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Params/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Params/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Search\Base\Params */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Results/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Results/PluginManagerTest.php index cfafe8d6baf..8edb4abf2ed 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Results/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Results/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Search\Base\Results */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php index d584e3cdefa..7514f6b4a8b 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php @@ -404,7 +404,7 @@ class SpellingProcessorTest extends TestCase * * @return void * - * @expectedException \Exception + * @expectedException \Exception * @expectedExceptionMessage Unexpected suggestion format; spellcheck.extendedResults must be set to true. */ public function testDetectionOfMissingExtendedResultsSetting() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Session/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Session/PluginManagerTest.php index 5bb81dade21..c95582caa7f 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Session/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Session/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to Zend\Session\SaveHandler\SaveHandlerInterface */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Statistics/Driver/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Statistics/Driver/PluginManagerTest.php index 582311a5c62..c37093e36f5 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Statistics/Driver/PluginManagerTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Statistics/Driver/PluginManagerTest.php @@ -55,7 +55,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase * * @return void * - * @expectedException Zend\ServiceManager\Exception\RuntimeException + * @expectedException Zend\ServiceManager\Exception\RuntimeException * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Statistics\Driver\AbstractBase */ public function testExpectedInterface() diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/CitationTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/CitationTest.php index 9c409fe8d86..bfd33b1a0e3 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/CitationTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/CitationTest.php @@ -39,10 +39,11 @@ use VuFind\View\Helper\Root\Citation; */ class CitationTest extends \VuFindTest\Unit\ViewHelperTestCase { - /** Sample citations -- each element of this array contains three elements -- + /** + * Sample citations -- each element of this array contains three elements -- * the raw input data and the expected apa/mla output citations. * - * @var array + * @var array */ protected $citations = [ // @codingStandardsIgnoreStart diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php index 0139536e006..beaeb3cfecc 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php @@ -44,7 +44,7 @@ class RecordTest extends \PHPUnit_Framework_TestCase * * @return void * - * @expectedException Zend\View\Exception\RuntimeException + * @expectedException Zend\View\Exception\RuntimeException * @expectedExceptionMessage Cannot find core.phtml template for record driver: VuFind\RecordDriver\SolrMarc */ public function testMissingTemplate() @@ -451,7 +451,7 @@ class RecordTest extends \PHPUnit_Framework_TestCase * * @return void * - * @expectedException Exception + * @expectedException Exception * @expectedExceptionMessage Invalid URL array. */ public function testGetLinkDetailsFailure() diff --git a/module/VuFindConsole/src/VuFindConsole/Controller/GenerateController.php b/module/VuFindConsole/src/VuFindConsole/Controller/GenerateController.php index 296f8cdc7f8..01d630a3115 100644 --- a/module/VuFindConsole/src/VuFindConsole/Controller/GenerateController.php +++ b/module/VuFindConsole/src/VuFindConsole/Controller/GenerateController.php @@ -165,7 +165,7 @@ class GenerateController extends AbstractBase // Write updated configuration $this->writeModuleConfig($configPath, $config); return $this->getSuccessResponse(); - } + } /** * Add a new record route definition diff --git a/module/VuFindConsole/tests/unit-tests/bootstrap.php b/module/VuFindConsole/tests/unit-tests/bootstrap.php index 01e13955ada..d63f479a605 100644 --- a/module/VuFindConsole/tests/unit-tests/bootstrap.php +++ b/module/VuFindConsole/tests/unit-tests/bootstrap.php @@ -7,7 +7,7 @@ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License * @copyright Copyright (C) Villanova University 2011 */ -require_once('Zend/Loader/AutoloaderFactory.php'); +require_once'Zend/Loader/AutoloaderFactory.php'; \Zend\Loader\AutoloaderFactory::factory( [ 'Zend\Loader\StandardAutoloader' => [ diff --git a/module/VuFindSearch/tests/unit-tests/bootstrap.php b/module/VuFindSearch/tests/unit-tests/bootstrap.php index 9ef1e7ad79c..a637fdbe3de 100644 --- a/module/VuFindSearch/tests/unit-tests/bootstrap.php +++ b/module/VuFindSearch/tests/unit-tests/bootstrap.php @@ -7,7 +7,7 @@ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License * @copyright Copyright (C) Villanova University 2011 */ -require_once('Zend/Loader/AutoloaderFactory.php'); +require_once'Zend/Loader/AutoloaderFactory.php'; \Zend\Loader\AutoloaderFactory::factory( [ 'Zend\Loader\StandardAutoloader' => [ diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/Response/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/Response/RecordCollectionFactoryTest.php index b43e63d4ebe..ac2d8b840e8 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/Response/RecordCollectionFactoryTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/Response/RecordCollectionFactoryTest.php @@ -47,7 +47,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Record factory must be callable. */ public function testConstructorRequiresFactoryFunction() @@ -60,12 +60,16 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Unexpected type of value: Expected array, got string */ public function testFactoryRequiresArray() { - $factory = new RecordCollectionFactory(function () {}); + $factory = new RecordCollectionFactory( + function () { + + } + ); $factory->factory('bad'); } } \ No newline at end of file diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/Response/XML/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/Response/XML/RecordCollectionFactoryTest.php index 93f8861dc60..7c956b1f2d3 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/Response/XML/RecordCollectionFactoryTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/Response/XML/RecordCollectionFactoryTest.php @@ -47,7 +47,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Record factory must be callable. */ public function testConstructorRequiresValidFactoryFunction() @@ -60,12 +60,16 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Unexpected type of value: Expected array, got string */ public function testInvalidInput() { - $fact = new RecordCollectionFactory(function () {}); + $fact = new RecordCollectionFactory( + function () { + + } + ); $coll = $fact->factory('garbage'); } } \ No newline at end of file diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php index 2466e8075e0..8f5343ee604 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php @@ -150,8 +150,8 @@ class BackendTest extends \VuFindTest\Unit\TestCase { $conn = $this->getConnectorMock(['query']); $conn->expects($this->once()) - ->method('query') - ->will($this->throwException(new \Exception())); + ->method('query') + ->will($this->throwException(new \Exception())); $back = new Backend($conn); $back->search(new Query(), 1, 1); } @@ -167,9 +167,9 @@ class BackendTest extends \VuFindTest\Unit\TestCase $expectedParams = ['foo' => 'bar', 'search' => 'baz']; $conn = $this->getConnectorMock(['query']); $conn->expects($this->once()) - ->method('query') - ->with($this->equalTo($expectedParams), $this->equalTo(0), $this->equalTo(10)) - ->will($this->returnValue(['recordCount' => 0, 'documents' => []])); + ->method('query') + ->with($this->equalTo($expectedParams), $this->equalTo(0), $this->equalTo(10)) + ->will($this->returnValue(['recordCount' => 0, 'documents' => []])); $back = new Backend($conn); $back->search(new Query('baz'), 0, 10, $myParams); } @@ -184,14 +184,14 @@ class BackendTest extends \VuFindTest\Unit\TestCase $conn = $this->getConnectorMock(['query']); $expectedParams0 = ['search' => 'baz']; $conn->expects($this->at(0)) - ->method('query') - ->with($this->equalTo($expectedParams0), $this->equalTo(0), $this->equalTo(10)) - ->will($this->returnValue(['recordCount' => 0, 'documents' => []])); + ->method('query') + ->with($this->equalTo($expectedParams0), $this->equalTo(0), $this->equalTo(10)) + ->will($this->returnValue(['recordCount' => 0, 'documents' => []])); $expectedParams1 = ['search' => 'fallback']; $conn->expects($this->at(1)) - ->method('query') - ->with($this->equalTo($expectedParams1), $this->equalTo(0), $this->equalTo(10)) - ->will($this->returnValue(['recordCount' => 0, 'documents' => []])); + ->method('query') + ->with($this->equalTo($expectedParams1), $this->equalTo(0), $this->equalTo(10)) + ->will($this->returnValue(['recordCount' => 0, 'documents' => []])); $back = new Backend($conn, null, 'fallback'); $back->search(new Query('baz'), 0, 10); } diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/Response/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/Response/RecordCollectionFactoryTest.php index 8d8bf8c395f..5064ec63e83 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/Response/RecordCollectionFactoryTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/Response/RecordCollectionFactoryTest.php @@ -60,7 +60,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Unexpected type of value: Expected array, got string */ public function testInvalidInput() diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php index 4aa672c98bf..4c57ff0eb58 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php @@ -139,8 +139,8 @@ class BackendTest extends \VuFindTest\Unit\TestCase { $conn = $this->getConnectorMock(['query']); $conn->expects($this->once()) - ->method('query') - ->will($this->throwException(new \Exception())); + ->method('query') + ->will($this->throwException(new \Exception())); $back = new Backend($conn); $back->search(new Query(), 1, 1); } @@ -156,8 +156,8 @@ class BackendTest extends \VuFindTest\Unit\TestCase { $conn = $this->getConnectorMock(['getRecord']); $conn->expects($this->once()) - ->method('getRecord') - ->will($this->throwException(new \Exception())); + ->method('getRecord') + ->will($this->throwException(new \Exception())); $back = new Backend($conn); $back->retrieve('1234'); } @@ -173,9 +173,9 @@ class BackendTest extends \VuFindTest\Unit\TestCase $expectedParams = ['foo' => 'bar', 'limit' => 10, 'pageNumber' => 1.0, 'query' => [['index' => null, 'lookfor' => 'baz']]]; $conn = $this->getConnectorMock(['query']); $conn->expects($this->once()) - ->method('query') - ->with($this->equalTo('inst-id'), $this->equalTo($expectedParams['query']), $this->equalTo($expectedParams)) - ->will($this->returnValue(['recordCount' => 0, 'documents' => []])); + ->method('query') + ->with($this->equalTo('inst-id'), $this->equalTo($expectedParams['query']), $this->equalTo($expectedParams)) + ->will($this->returnValue(['recordCount' => 0, 'documents' => []])); $back = new Backend($conn); $back->search(new Query('baz'), 0, 10, $myParams); } diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/Response/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/Response/RecordCollectionFactoryTest.php index ef547f0995f..f9c2119925b 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/Response/RecordCollectionFactoryTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/Response/RecordCollectionFactoryTest.php @@ -47,7 +47,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Record factory must be callable. */ public function testConstructorRequiresValidFactoryFunction() @@ -60,7 +60,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Unexpected type of value: Expected array, got string */ public function testInvalidInput() diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/BackendTest.php index 229fc629efc..7125821c1b0 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/BackendTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/BackendTest.php @@ -148,7 +148,7 @@ class BackendTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage JSON decoding error: 4 -- bad { */ public function testBadJson() @@ -166,7 +166,7 @@ class BackendTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Invalid response writer type: xml */ public function testInjectResponseWriterThrownOnIncompabileResponseWriter() @@ -181,7 +181,7 @@ class BackendTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Invalid named list implementation type: bad */ public function testInjectResponseWriterThrownOnIncompabileNamedListSetting() @@ -221,7 +221,7 @@ class BackendTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\RemoteErrorException + * @expectedException VuFindSearch\Backend\Exception\RemoteErrorException * @expectedExceptionMessage Alphabetic Browse index missing. */ public function testRefineAlphaBrowseException() @@ -234,7 +234,7 @@ class BackendTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\RemoteErrorException + * @expectedException VuFindSearch\Backend\Exception\RemoteErrorException * @expectedExceptionMessage Alphabetic Browse index missing. */ public function testRefineAlphaBrowseExceptionWithAltString() @@ -247,7 +247,7 @@ class BackendTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\RemoteErrorException + * @expectedException VuFindSearch\Backend\Exception\RemoteErrorException * @expectedExceptionMessage not a browse error */ public function testRefineAlphaBrowseExceptionWithNonBrowseString() diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/ConnectorTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/ConnectorTest.php index 07e989a8f79..3edad67581a 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/ConnectorTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/ConnectorTest.php @@ -114,7 +114,7 @@ class ConnectorTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException InvalidArgumentException + * @expectedException InvalidArgumentException * @expectedExceptionMessage AdapterInterface */ public function testSetAdapterThrowsInvalidObject() diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Document/UpdateDocumentTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Document/UpdateDocumentTest.php index 585e272f34e..a8ad2a3db37 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Document/UpdateDocumentTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Document/UpdateDocumentTest.php @@ -52,8 +52,8 @@ class UpdateDocumentTest extends PHPUnit_Framework_TestCase { $record = $this->getMockForAbstractClass('VuFindSearch\Backend\Solr\Record\SerializableRecordInterface'); $record->expects($this->once()) - ->method('getFields') - ->will($this->returnValue(['id' => 'ID', 'field' => 'FIELD'])); + ->method('getFields') + ->will($this->returnValue(['id' => 'ID', 'field' => 'FIELD'])); $document = new UpdateDocument(); $document->addRecord($record, ['boost' => '2.0']); $xml = $document->asXML(); diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/HandlerMapTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/HandlerMapTest.php index f47d299dba9..64e3943f2f7 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/HandlerMapTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/HandlerMapTest.php @@ -51,7 +51,7 @@ class HandlerMapTest extends TestCase * * @return void * - * @expectedException InvalidArgumentException + * @expectedException InvalidArgumentException * @expectedExceptionMessage Duplicate fallback */ public function testSetHandlerMapThrowsOnDuplicateFallback() @@ -68,7 +68,7 @@ class HandlerMapTest extends TestCase * * @return void * - * @expectedException InvalidArgumentException + * @expectedException InvalidArgumentException * @expectedExceptionMessage Handler for function already defined */ public function testSetHandlerMapThrowsOnDuplicateFunctionHandler() @@ -85,7 +85,7 @@ class HandlerMapTest extends TestCase * * @return void * - * @expectedException RuntimeException + * @expectedException RuntimeException * @expectedExceptionMessage Undefined function handler */ public function testGetHandlerThrowsOnUndefinedFunctionHandler() @@ -99,7 +99,7 @@ class HandlerMapTest extends TestCase * * @return void * - * @expectedException InvalidArgumentException + * @expectedException InvalidArgumentException * @expectedExceptionMessage Invalid parameter key: bad */ public function testGetParametersThrowsOnUndefinedType() @@ -113,7 +113,7 @@ class HandlerMapTest extends TestCase * * @return void * - * @expectedException InvalidArgumentException + * @expectedException InvalidArgumentException * @expectedExceptionMessage Invalid parameter key: bad */ public function testSetParametersThrowsOnUndefinedType() diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/RecordCollectionFactoryTest.php index 79b67b0b473..94d5da88f50 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/RecordCollectionFactoryTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/RecordCollectionFactoryTest.php @@ -60,7 +60,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Unexpected type of value: Expected array, got string */ public function testInvalidInput() diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/BackendTest.php index 10b0e0a3177..d7f304c385c 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/BackendTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/BackendTest.php @@ -128,8 +128,8 @@ class BackendTest extends TestCase $fact = $this->getMock('VuFindSearch\Response\RecordCollectionFactoryInterface'); $conn = $this->getConnectorMock(['getRecord']); $conn->expects($this->once()) - ->method('getRecord') - ->will($this->throwException(new SummonException())); + ->method('getRecord') + ->will($this->throwException(new SummonException())); $back = new Backend($conn, $fact); $back->retrieve('id'); } @@ -180,8 +180,8 @@ class BackendTest extends TestCase $fact = $this->getMock('VuFindSearch\Response\RecordCollectionFactoryInterface'); $conn = $this->getConnectorMock(['query']); $conn->expects($this->once()) - ->method('query') - ->will($this->throwException(new SummonException())); + ->method('query') + ->will($this->throwException(new SummonException())); $back = new Backend($conn, $fact); $back->search(new Query(), 1, 1); } @@ -197,9 +197,9 @@ class BackendTest extends TestCase $expectedParams = new SummonQuery('boo:(baz)', ['pageSize' => 10, 'pageNumber' => 1.0, 'maxTopics' => 32]); $conn = $this->getConnectorMock(['query']); $conn->expects($this->once()) - ->method('query') - ->with($this->equalTo($expectedParams)) - ->will($this->returnValue(['recordCount' => 0, 'documents' => []])); + ->method('query') + ->with($this->equalTo($expectedParams)) + ->will($this->returnValue(['recordCount' => 0, 'documents' => []])); $back = new Backend($conn); $back->search(new Query('baz', 'boo'), 0, 10, $myParams); } diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/Response/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/Response/RecordCollectionFactoryTest.php index 36c64088628..296fdcd9387 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/Response/RecordCollectionFactoryTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/Response/RecordCollectionFactoryTest.php @@ -47,7 +47,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Record factory must be callable. */ public function testConstructorRequiresFactoryFunction() @@ -60,12 +60,16 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Unexpected type of value: Expected array, got string */ public function testFactoryRequiresArray() { - $factory = new RecordCollectionFactory(function () {}); + $factory = new RecordCollectionFactory( + function () { + + } + ); $factory->factory('bad'); } } \ No newline at end of file diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/Response/XML/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/Response/XML/RecordCollectionFactoryTest.php index 3a800e995d1..bd5ab0c4f40 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/Response/XML/RecordCollectionFactoryTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/Response/XML/RecordCollectionFactoryTest.php @@ -46,7 +46,7 @@ class RecordCollectionFactoryTest extends \PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Record factory must be callable. */ public function testBadCallback() @@ -59,7 +59,7 @@ class RecordCollectionFactoryTest extends \PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Unexpected type of value: Expected array, got string */ public function testBadFactoryInput() diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Query/QueryGroupTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Query/QueryGroupTest.php index 0d591f7c1bd..df32e5be9f5 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Query/QueryGroupTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Query/QueryGroupTest.php @@ -123,7 +123,7 @@ class QueryGroupTest extends PHPUnit_Framework_TestCase * * @return void * - * @expectedException VuFindSearch\Exception\InvalidArgumentException + * @expectedException VuFindSearch\Exception\InvalidArgumentException * @expectedExceptionMessage Unknown or invalid boolean operator: fizz */ public function testIllegalOperator() diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php index ace86cb05bb..f65158c1118 100644 --- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php +++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php @@ -85,7 +85,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage test */ public function testRetrieveException() @@ -110,7 +110,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage test */ public function testSearchException() @@ -192,7 +192,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage test */ public function testRetrieveBatchInterfaceException() @@ -225,7 +225,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage test */ public function testRetrieveBatchNoInterfaceException() @@ -263,11 +263,12 @@ class SearchServiceTest extends TestCase $backend->expects($this->once())->method('random') ->with( - $this->equalTo($query), - $this->equalTo("10"), - $this->equalTo($params) - )->will($this->returnValue($response) - ); + $this->equalTo($query), + $this->equalTo("10"), + $this->equalTo($params) + )->will( + $this->returnValue($response) + ); $em = $service->getEventManager(); $em->expects($this->at(0))->method('trigger') ->with($this->equalTo('pre'), $this->equalTo($backend)); @@ -284,7 +285,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage test */ public function testRandomInterfaceWithException() @@ -299,11 +300,11 @@ class SearchServiceTest extends TestCase $query = new Query('test'); $backend->expects($this->once())->method('random') - ->with( - $this->equalTo($query), - $this->equalTo("10"), - $this->equalTo($params) - )->will($this->throwException($exception)); + ->with( + $this->equalTo($query), + $this->equalTo("10"), + $this->equalTo($params) + )->will($this->throwException($exception)); $em = $service->getEventManager(); $em->expects($this->at(0))->method('trigger') @@ -334,12 +335,12 @@ class SearchServiceTest extends TestCase // First Search Grabs 0 records but uses get total method $backend->expects($this->at(0))->method('search') - ->with( - $this->equalTo($query), - $this->equalTo("0"), - $this->equalTo("0"), - $this->equalTo($params) - )->will($this->returnValue($responseForZero)); + ->with( + $this->equalTo($query), + $this->equalTo("0"), + $this->equalTo("0"), + $this->equalTo($params) + )->will($this->returnValue($responseForZero)); $responseForZero->expects($this->once())->method('getTotal') ->will($this->returnValue($total)); @@ -354,8 +355,9 @@ class SearchServiceTest extends TestCase $this->anything(), $this->equalTo("1"), $this->equalTo($params) - )->will($this->returnValue($response) - ); + )->will( + $this->returnValue($response) + ); } $em = $service->getEventManager(); @@ -435,10 +437,10 @@ class SearchServiceTest extends TestCase // Second search grabs all the records and calls shuffle $backend->expects($this->at(1))->method('search') ->with( - $this->equalTo($query), - $this->equalTo("0"), - $this->equalTo($limit), - $this->equalTo($params) + $this->equalTo($query), + $this->equalTo("0"), + $this->equalTo($limit), + $this->equalTo($params) )->will($this->returnValue($response)); $response->expects($this->once())->method('shuffle'); @@ -455,7 +457,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage test */ public function testRandomNoInterfaceWithExceptionAtFirstSearch() @@ -482,7 +484,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage test */ public function testRandomNoInterfaceWithExceptionAtItemSearch() @@ -499,12 +501,12 @@ class SearchServiceTest extends TestCase // First Search Grabs 0 records but uses get total method $backend->expects($this->at(0))->method('search') - ->with( - $this->equalTo($query), - $this->equalTo("0"), - $this->equalTo("0"), - $this->equalTo($params) - )->will($this->returnValue($responseForZero)); + ->with( + $this->equalTo($query), + $this->equalTo("0"), + $this->equalTo("0"), + $this->equalTo($params) + )->will($this->returnValue($responseForZero)); $responseForZero->expects($this->once())->method('getTotal') ->will($this->returnValue($total)); @@ -525,7 +527,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage test */ public function testRandomNoInterfaceExceptionWithLessResultsThanLimit() @@ -543,12 +545,12 @@ class SearchServiceTest extends TestCase // First Search Grabs 0 records but uses get total method $backend->expects($this->at(0))->method('search') - ->with( - $this->equalTo($query), - $this->equalTo("0"), - $this->equalTo("0"), - $this->equalTo($params) - )->will($this->returnValue($responseForZero)); + ->with( + $this->equalTo($query), + $this->equalTo("0"), + $this->equalTo("0"), + $this->equalTo($params) + )->will($this->returnValue($responseForZero)); $responseForZero->expects($this->once())->method('getTotal') ->will($this->returnValue($total)); @@ -598,7 +600,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage foo does not support similar() */ public function testSimilarOnNonSupportingBackend() @@ -613,7 +615,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Backend\Exception\BackendException + * @expectedException VuFindSearch\Backend\Exception\BackendException * @expectedExceptionMessage test */ public function testSimilarException() @@ -644,7 +646,7 @@ class SearchServiceTest extends TestCase * * @return void * - * @expectedException VuFindSearch\Exception\RuntimeException + * @expectedException VuFindSearch\Exception\RuntimeException * @expectedExceptionMessage Unable to resolve backend: retrieve, junk */ public function testFailedResolve() diff --git a/module/VuFindTheme/tests/unit-tests/bootstrap.php b/module/VuFindTheme/tests/unit-tests/bootstrap.php index 1a7694d7214..26c6bf5d5ba 100644 --- a/module/VuFindTheme/tests/unit-tests/bootstrap.php +++ b/module/VuFindTheme/tests/unit-tests/bootstrap.php @@ -7,7 +7,7 @@ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License * @copyright Copyright (C) Villanova University 2011 */ -require_once('Zend/Loader/AutoloaderFactory.php'); +require_once 'Zend/Loader/AutoloaderFactory.php'; \Zend\Loader\AutoloaderFactory::factory( [ 'Zend\Loader\StandardAutoloader' => [ diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php index 73ddb0a16d7..9d087ae49cd 100644 --- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php +++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php @@ -82,7 +82,7 @@ class ThemeInfoTest extends Unit\TestCase * * @return void * - * @expectedException Exception + * @expectedException Exception * @expectedExceptionMessage Cannot load theme: invalid */ public function testInvalidTheme() -- GitLab