From b4e595f07893ca077e50c734a1d4407ff4592e68 Mon Sep 17 00:00:00 2001 From: Vasil Rangelov Date: Fri, 9 Jun 2023 12:14:22 +0300 Subject: [PATCH] Made tests be able to run on all supported PHP versions, and run successfully. As part of accomplishing this, the following was done: - Added "yoast/phpunit-polyfills" as a dev dependency. - Modified fixtures to use the polyfilled methods (as they are cross version compatible). - Added a custom test runner (that is compatible across PHPUnit versions). - Modified PHPUnit version to be "^7|^8|^9", since each is supported by different PHP versions. - Modified the rector version to "^0.12.19", as that is the last one still supporting PHP 7.1. - Changed expectNotice() and expectError() to expecting the equivalent PHPUnit exception, to avoid deprecation notice and support PHPUnit 7, where this feature is absent. - Removed the requires annotation in Zend_Filter_Encrypt_OpensslTest - Explicitly added "RC4" as the value for the algo to appease supported PHP versions. Why RC4? Because that is the default, and has been the default, and ZF has had no option to override it. Such option could be introduced in a separate PR maybe. - Fixed a type related warning in OpenSSL related tests, by casting array keys to strings before the remaining checks that assume a string. - Added an openssl.conf file that enables the legacy provider, in addition to the default, in order to enable the tests to pass in newer OpenSSL versions that even older PHP versions are now being compiled against. Also provided higher test coverage overall. To accomplish that part: - Added "symfony/polyfill-ctype" as a runtime dependency, as it can be disabled (while the test tooling does not require it), but is required by many components. - Made PHPUnit run twice - once with the bare minimum of extensions needed to get it going, and a second time with all extensions that can be enabled for the given PHP version. Zend_Barcode_AllTests in particular benefits of this, as it has both tests that work only if GD is disabled, as well as tests that run only if GD is enabled. - Moved the PHP extensions from the env into a matrix, and adjusted the set of extensions to be one that the PHP version would support. - Adjusted the JSON encoder and decoder to explicitly use "UTF-16BE" instead of just "UTF-16", as the mbstring polyfill uses iconv, which in turn aliases "UTF-16" to "UTF-16LE", while the true mbstring extension aliases "UTF-16" to "UTF-16BE". The explicit notation works with both. - Adjusted the testDisablingTryCommonMagicFilesIgnoresCommonLocations() test to call setMagicFile(false) when the environment is not good, i.e. when fileinfo is not present. - Added some requires annotations where PDO was assumed to be present. --- .github/workflows/phpunit.yml | 63 ++++++++++++++++--- composer.json | 6 +- library/Zend/Filter/Encrypt/Openssl.php | 9 +-- library/Zend/Json/Decoder.php | 2 +- library/Zend/Json/Encoder.php | 3 +- tests/AllTests.php | 4 +- tests/TestHelper.php | 2 +- tests/Zend/Acl/AclTest.php | 6 +- tests/Zend/Acl/AllTests.php | 4 +- tests/Zend/AllTests.php | 4 +- .../Zend/AllTests/StreamWrapper/PhpInput.php | 4 +- tests/Zend/Amf/Adobe/IntrospectorTest.php | 8 +-- tests/Zend/Amf/AllTests.php | 4 +- tests/Zend/Amf/AuthTest.php | 12 ++-- tests/Zend/Amf/RequestTest.php | 10 +-- tests/Zend/Amf/ResourceTest.php | 10 +-- tests/Zend/Amf/Response/HttpTest.php | 6 +- tests/Zend/Amf/ResponseTest.php | 10 +-- tests/Zend/Amf/ServerTest.php | 10 +-- tests/Zend/Amf/TypeLoaderTest.php | 6 +- tests/Zend/Amf/Util/BinaryStreamTest.php | 6 +- tests/Zend/Amf/Value/ArrayCollectionTest.php | 10 +-- tests/Zend/Amf/Value/MessageBodyTest.php | 8 +-- tests/Zend/Amf/Value/MessageHeaderTest.php | 6 +- tests/Zend/Application/AllTests.php | 4 +- tests/Zend/Application/ApplicationTest.php | 10 +-- .../Bootstrap/BootstrapAbstractTest.php | 10 +-- .../Application/Bootstrap/BootstrapTest.php | 10 +-- .../Application/Module/AutoloaderTest.php | 10 +-- .../Zend/Application/Module/BootstrapTest.php | 10 +-- tests/Zend/Application/Resource/AllTests.php | 4 +- .../Application/Resource/CacheManagerTest.php | 10 +-- tests/Zend/Application/Resource/DbTest.php | 30 ++++++--- tests/Zend/Application/Resource/DojoTest.php | 10 +-- .../Resource/FrontcontrollerTest.php | 10 +-- .../Zend/Application/Resource/LayoutTest.php | 10 +-- .../Zend/Application/Resource/LocaleTest.php | 10 +-- tests/Zend/Application/Resource/LogTest.php | 10 +-- tests/Zend/Application/Resource/MailTest.php | 10 +-- .../Zend/Application/Resource/ModulesTest.php | 10 +-- .../Zend/Application/Resource/MultidbTest.php | 12 ++-- .../Application/Resource/NavigationTest.php | 10 +-- .../Resource/ResourceAbstractTest.php | 10 +-- .../Zend/Application/Resource/RouterTest.php | 10 +-- .../Zend/Application/Resource/SessionTest.php | 4 +- .../Application/Resource/TranslateTest.php | 10 +-- .../Application/Resource/UseragentTest.php | 10 +-- tests/Zend/Application/Resource/ViewTest.php | 10 +-- tests/Zend/Auth/Adapter/AllTests.php | 4 +- tests/Zend/Auth/Adapter/DbTable/AllTests.php | 4 +- .../Auth/Adapter/DbTable/BasicSqliteTest.php | 10 +-- .../DbTable/BasicSqliteTest/SkipTests.php | 4 +- tests/Zend/Auth/Adapter/DigestTest.php | 4 +- tests/Zend/Auth/Adapter/Http/AllTests.php | 4 +- tests/Zend/Auth/Adapter/Http/AuthTest.php | 4 +- tests/Zend/Auth/Adapter/Http/ObjectTest.php | 4 +- tests/Zend/Auth/Adapter/Http/ProxyTest.php | 4 +- .../Auth/Adapter/Http/Resolver/AllTests.php | 4 +- .../Auth/Adapter/Http/Resolver/FileTest.php | 4 +- tests/Zend/Auth/Adapter/Ldap/AllTests.php | 6 +- tests/Zend/Auth/Adapter/Ldap/OfflineTest.php | 4 +- tests/Zend/Auth/Adapter/Ldap/OnlineTest.php | 7 ++- tests/Zend/Auth/Adapter/OpenId/AllTests.php | 4 +- tests/Zend/Auth/Adapter/OpenId/OpenIdTest.php | 5 +- tests/Zend/Auth/AllTests.php | 4 +- tests/Zend/AuthTest.php | 2 +- tests/Zend/Barcode/AllTests.php | 4 +- tests/Zend/Barcode/FactoryTest.php | 2 +- tests/Zend/Barcode/Object/TestCommon.php | 6 +- tests/Zend/Barcode/Renderer/ImageTest.php | 4 +- tests/Zend/Barcode/Renderer/TestCommon.php | 6 +- tests/Zend/Cache/AllTests.php | 4 +- tests/Zend/Cache/ApcBackendTest.php | 8 +-- tests/Zend/Cache/ClassFrontendTest.php | 6 +- tests/Zend/Cache/CommonBackendTest.php | 6 +- .../Zend/Cache/CommonExtendedBackendTest.php | 4 +- tests/Zend/Cache/CoreTest.php | 6 +- tests/Zend/Cache/FactoryException.php | 2 +- tests/Zend/Cache/FactoryTest.php | 6 +- tests/Zend/Cache/FileBackendTest.php | 18 +++--- tests/Zend/Cache/FileFrontendTest.php | 6 +- tests/Zend/Cache/FunctionFrontendTest.php | 6 +- tests/Zend/Cache/LibmemcachedBackendTest.php | 8 +-- tests/Zend/Cache/ManagerTest.php | 6 +- tests/Zend/Cache/MemcachedBackendTest.php | 8 +-- tests/Zend/Cache/OutputFrontendTest.php | 6 +- tests/Zend/Cache/PageFrontendTest.php | 6 +- tests/Zend/Cache/SkipTests.php | 4 +- tests/Zend/Cache/SqliteBackendTest.php | 14 ++--- tests/Zend/Cache/StaticBackendTest.php | 14 ++--- tests/Zend/Cache/TwoLevelsBackendTest.php | 8 +-- tests/Zend/Cache/WinCacheBackendTest.php | 8 +-- tests/Zend/Cache/XcacheBackendTest.php | 8 +-- tests/Zend/Cache/ZendPlatformBackendTest.php | 8 +-- tests/Zend/Cache/ZendServerDiskTest.php | 8 +-- tests/Zend/Cache/ZendServerShMemTest.php | 8 +-- tests/Zend/Captcha/AllTests.php | 4 +- tests/Zend/Captcha/DumbTest.php | 10 +-- tests/Zend/Captcha/FigletTest.php | 12 ++-- tests/Zend/Captcha/ImageTest.php | 10 +-- tests/Zend/Captcha/ReCaptchaTest.php | 10 +-- tests/Zend/Cloud/AllTests.php | 4 +- .../DocumentService/Adapter/AllTests.php | 4 +- .../DocumentService/Adapter/SimpleDbTest.php | 4 +- .../Adapter/WindowsAzureTest.php | 4 +- tests/Zend/Cloud/DocumentService/AllTests.php | 4 +- .../Cloud/DocumentService/FactoryTest.php | 6 +- tests/Zend/Cloud/DocumentService/TestCase.php | 6 +- .../Cloud/Infrastructure/Adapter/AllTests.php | 4 +- .../Cloud/Infrastructure/Adapter/Ec2Test.php | 6 +- .../Infrastructure/Adapter/RackspaceTest.php | 6 +- tests/Zend/Cloud/Infrastructure/AllTests.php | 4 +- .../Zend/Cloud/Infrastructure/FactoryTest.php | 6 +- tests/Zend/Cloud/Infrastructure/TestCase.php | 6 +- .../Cloud/QueueService/Adapter/AllTests.php | 4 +- .../Cloud/QueueService/Adapter/SqsTest.php | 8 +-- .../QueueService/Adapter/WindowsAzureTest.php | 8 +-- .../QueueService/Adapter/ZendQueueTest.php | 4 +- tests/Zend/Cloud/QueueService/AllTests.php | 4 +- tests/Zend/Cloud/QueueService/FactoryTest.php | 6 +- tests/Zend/Cloud/QueueService/TestCase.php | 4 +- .../Cloud/StorageService/Adapter/AllTests.php | 4 +- .../StorageService/Adapter/FileSystemTest.php | 12 ++-- .../StorageService/Adapter/RackspaceTest.php | 10 +-- .../Cloud/StorageService/Adapter/S3Test.php | 12 ++-- .../Adapter/WindowsAzureTest.php | 4 +- tests/Zend/Cloud/StorageService/AllTests.php | 4 +- .../Zend/Cloud/StorageService/FactoryTest.php | 6 +- tests/Zend/Cloud/StorageService/TestCase.php | 4 +- tests/Zend/CodeGenerator/AllTests.php | 4 +- tests/Zend/CodeGenerator/Php/AllTests.php | 4 +- tests/Zend/CodeGenerator/Php/ClassTest.php | 2 +- .../Php/Docblock/Tag/ParamTest.php | 6 +- .../Php/Docblock/Tag/ReturnTest.php | 6 +- .../CodeGenerator/Php/Docblock/TagTest.php | 6 +- tests/Zend/CodeGenerator/Php/DocblockTest.php | 6 +- tests/Zend/CodeGenerator/Php/FileTest.php | 2 +- tests/Zend/CodeGenerator/Php/MethodTest.php | 6 +- .../Zend/CodeGenerator/Php/ParameterTest.php | 6 +- .../Php/Property/DefaultValueTest.php | 2 +- tests/Zend/CodeGenerator/Php/PropertyTest.php | 4 +- tests/Zend/Config/AllTests.php | 4 +- tests/Zend/Config/IniTest.php | 4 +- tests/Zend/Config/JsonTest.php | 4 +- tests/Zend/Config/Writer/AllTests.php | 4 +- tests/Zend/Config/Writer/ArrayTest.php | 6 +- tests/Zend/Config/Writer/IniTest.php | 6 +- tests/Zend/Config/Writer/JsonTest.php | 6 +- tests/Zend/Config/Writer/XmlTest.php | 6 +- tests/Zend/Config/Writer/YamlTest.php | 6 +- tests/Zend/Config/XmlTest.php | 4 +- tests/Zend/Config/YamlTest.php | 4 +- tests/Zend/ConfigTest.php | 4 +- tests/Zend/Console/AllTests.php | 4 +- tests/Zend/Console/GetoptTest.php | 4 +- .../Action/Helper/ActionStackTest.php | 10 +-- .../Action/Helper/AjaxContextTest.php | 10 +-- .../Controller/Action/Helper/AllTests.php | 4 +- .../Action/Helper/AutoCompleteTest.php | 10 +-- .../Controller/Action/Helper/CacheTest.php | 10 +-- .../Action/Helper/ContextSwitchTest.php | 10 +-- .../Action/Helper/FlashMessengerTest.php | 8 +-- .../Controller/Action/Helper/JsonTest.php | 10 +-- .../Action/Helper/NamespaceTest.php | 6 +- .../Action/Helper/RedirectorTest.php | 10 +-- .../Zend/Controller/Action/Helper/UrlTest.php | 10 +-- .../Action/Helper/ViewRendererTest.php | 10 +-- .../Action/HelperBroker/PriorityStackTest.php | 4 +- .../Controller/Action/HelperBrokerTest.php | 8 +-- tests/Zend/Controller/ActionTest.php | 10 +-- tests/Zend/Controller/AllTests.php | 4 +- .../Controller/Dispatcher/StandardTest.php | 10 +-- tests/Zend/Controller/FrontTest.php | 10 +-- .../Controller/Plugin/ActionStackTest.php | 10 +-- tests/Zend/Controller/Plugin/BrokerTest.php | 8 +-- .../Controller/Plugin/ErrorHandlerTest.php | 10 +-- .../Zend/Controller/Plugin/PutHandlerTest.php | 8 +-- .../Zend/Controller/Request/Apache404Test.php | 10 +-- tests/Zend/Controller/Request/HttpTest.php | 10 +-- .../Controller/Request/HttpTestCaseTest.php | 10 +-- tests/Zend/Controller/Request/SimpleTest.php | 6 +- tests/Zend/Controller/Response/HttpTest.php | 10 +-- .../Controller/Response/HttpTestCaseTest.php | 10 +-- tests/Zend/Controller/Router/RewriteTest.php | 10 +-- .../Controller/Router/Route/ChainTest.php | 6 +- .../Controller/Router/Route/HostnameTest.php | 6 +- .../Controller/Router/Route/ModuleTest.php | 8 +-- .../Controller/Router/Route/RegexTest.php | 2 +- .../Controller/Router/Route/StaticTest.php | 2 +- tests/Zend/Controller/Router/RouteTest.php | 8 +-- tests/Zend/Crypt/AllTests.php | 4 +- tests/Zend/Crypt/DiffieHellmanTest.php | 4 +- tests/Zend/Crypt/HmacTest.php | 2 +- tests/Zend/Crypt/Math/AllTests.php | 4 +- .../Zend/Crypt/Math/BigInteger/BcmathTest.php | 4 +- tests/Zend/Crypt/Math/BigInteger/GmpTest.php | 4 +- tests/Zend/Crypt/MathTest.php | 2 +- tests/Zend/Crypt/Rsa/AllTests.php | 4 +- tests/Zend/Crypt/Rsa/RsaTest.php | 4 +- tests/Zend/CurrencyTest.php | 6 +- tests/Zend/Date/AllTests.php | 4 +- tests/Zend/Date/DateObjectTest.php | 6 +- tests/Zend/DateTest.php | 6 +- tests/Zend/Db/Adapter/Pdo/SqliteTest.php | 2 +- tests/Zend/Db/Adapter/SkipTests.php | 4 +- tests/Zend/Db/Adapter/StaticTest.php | 2 +- tests/Zend/Db/AllTests.php | 4 +- tests/Zend/Db/Profiler/AllTests.php | 4 +- tests/Zend/Db/Profiler/FirebugTest.php | 8 +-- tests/Zend/Db/Profiler/TestCommon.php | 8 +-- tests/Zend/Db/SkipTests.php | 4 +- tests/Zend/Db/Statement/StaticTest.php | 2 +- .../Db/Table/Relationships/StaticTest.php | 2 +- tests/Zend/Db/Table/Row/StaticTest.php | 2 +- tests/Zend/Db/Table/Rowset/StaticTest.php | 2 +- tests/Zend/Db/Table/Select/TestCommon.php | 8 +-- tests/Zend/Db/Table/StaticTest.php | 2 +- tests/Zend/Db/Table/TestCommon.php | 16 ++--- tests/Zend/Db/Table/TestSetup.php | 8 +-- .../_files/My/ZendDbTable/TableBugsCustom.php | 2 +- tests/Zend/Db/TestSetup.php | 14 ++--- tests/Zend/Db/TestUtil/Common.php | 4 +- tests/Zend/Db/TestUtil/Db2.php | 4 +- tests/Zend/Db/TestUtil/Mysqli.php | 8 +-- tests/Zend/Db/TestUtil/Pdo/Oci.php | 4 +- tests/Zend/Db/TestUtil/Pdo/Pgsql.php | 4 +- tests/Zend/DebugTest.php | 2 +- tests/Zend/Dojo/AllTests.php | 4 +- tests/Zend/Dojo/BuildLayerTest.php | 10 +-- tests/Zend/Dojo/DataTest.php | 8 +-- tests/Zend/Dojo/DojoTest.php | 10 +-- tests/Zend/Dojo/Form/AllTests.php | 4 +- .../Form/Decorator/AccordionContainerTest.php | 10 +-- .../Dojo/Form/Decorator/AccordionPaneTest.php | 10 +-- tests/Zend/Dojo/Form/Decorator/AllTests.php | 4 +- .../Form/Decorator/BorderContainerTest.php | 10 +-- .../Form/Decorator/DijitContainerTest.php | 10 +-- .../Dojo/Form/Decorator/DijitElementTest.php | 10 +-- .../Dojo/Form/Decorator/DijitFormTest.php | 10 +-- .../Form/Decorator/SplitContainerTest.php | 10 +-- .../Form/Decorator/StackContainerTest.php | 10 +-- .../Dojo/Form/Decorator/TabContainerTest.php | 10 +-- tests/Zend/Dojo/Form/Element/AllTests.php | 4 +- tests/Zend/Dojo/Form/Element/ButtonTest.php | 10 +-- tests/Zend/Dojo/Form/Element/CheckBoxTest.php | 10 +-- tests/Zend/Dojo/Form/Element/ComboBoxTest.php | 10 +-- .../Dojo/Form/Element/CurrencyTextBoxTest.php | 10 +-- .../Dojo/Form/Element/DateTextBoxTest.php | 10 +-- tests/Zend/Dojo/Form/Element/DijitTest.php | 10 +-- tests/Zend/Dojo/Form/Element/EditorTest.php | 10 +-- .../Dojo/Form/Element/FilteringSelectTest.php | 10 +-- .../Form/Element/HorizontalSliderTest.php | 10 +-- .../Dojo/Form/Element/NumberSpinnerTest.php | 10 +-- .../Dojo/Form/Element/NumberTextBoxTest.php | 10 +-- .../Dojo/Form/Element/PasswordTextBoxTest.php | 10 +-- .../Dojo/Form/Element/RadioButtonTest.php | 10 +-- .../Dojo/Form/Element/SimpleTextareaTest.php | 10 +-- .../Dojo/Form/Element/SubmitButtonTest.php | 10 +-- tests/Zend/Dojo/Form/Element/TextBoxTest.php | 10 +-- tests/Zend/Dojo/Form/Element/TextareaTest.php | 10 +-- .../Dojo/Form/Element/TimeTextBoxTest.php | 10 +-- .../Form/Element/ValidationTextBoxTest.php | 10 +-- .../Dojo/Form/Element/VerticalSliderTest.php | 10 +-- tests/Zend/Dojo/Form/FormTest.php | 10 +-- tests/Zend/Dojo/Form/SubFormTest.php | 10 +-- tests/Zend/Dojo/View/AllTests.php | 4 +- .../View/Helper/AccordionContainerTest.php | 10 +-- .../Dojo/View/Helper/AccordionPaneTest.php | 10 +-- tests/Zend/Dojo/View/Helper/AllTests.php | 4 +- .../Dojo/View/Helper/BorderContainerTest.php | 10 +-- tests/Zend/Dojo/View/Helper/ButtonTest.php | 10 +-- tests/Zend/Dojo/View/Helper/CheckBoxTest.php | 10 +-- tests/Zend/Dojo/View/Helper/ComboBoxTest.php | 10 +-- .../Zend/Dojo/View/Helper/ContentPaneTest.php | 10 +-- .../Dojo/View/Helper/CurrencyTextBoxTest.php | 10 +-- .../Zend/Dojo/View/Helper/CustomDijitTest.php | 10 +-- .../Zend/Dojo/View/Helper/DateTextBoxTest.php | 10 +-- tests/Zend/Dojo/View/Helper/DojoTest.php | 10 +-- tests/Zend/Dojo/View/Helper/EditorTest.php | 10 +-- .../Dojo/View/Helper/FilteringSelectTest.php | 10 +-- tests/Zend/Dojo/View/Helper/FormTest.php | 10 +-- .../Dojo/View/Helper/HorizontalSliderTest.php | 10 +-- .../Dojo/View/Helper/NumberSpinnerTest.php | 10 +-- .../Dojo/View/Helper/NumberTextBoxTest.php | 10 +-- .../Dojo/View/Helper/PasswordTextBoxTest.php | 10 +-- .../Zend/Dojo/View/Helper/RadioButtonTest.php | 10 +-- .../Dojo/View/Helper/SimpleTextareaTest.php | 10 +-- .../Dojo/View/Helper/SplitContainerTest.php | 10 +-- .../Dojo/View/Helper/StackContainerTest.php | 10 +-- .../Dojo/View/Helper/SubmitButtonTest.php | 10 +-- .../Dojo/View/Helper/TabContainerTest.php | 10 +-- tests/Zend/Dojo/View/Helper/TextBoxTest.php | 10 +-- tests/Zend/Dojo/View/Helper/TextareaTest.php | 10 +-- .../Zend/Dojo/View/Helper/TimeTextBoxTest.php | 10 +-- .../View/Helper/ValidationTextBoxTest.php | 10 +-- .../Dojo/View/Helper/VerticalSliderTest.php | 10 +-- tests/Zend/Dom/AllTests.php | 4 +- tests/Zend/Dom/Query/Css2XpathTest.php | 2 +- tests/Zend/Dom/Query/ResultTest.php | 4 +- tests/Zend/Dom/QueryTest.php | 10 +-- tests/Zend/EventManager/AllTests.php | 4 +- tests/Zend/EventManager/EventManagerTest.php | 8 +-- tests/Zend/EventManager/FilterChainTest.php | 8 +-- .../EventManager/GlobalEventManagerTest.php | 8 +-- .../EventManager/StaticEventManagerTest.php | 10 +-- .../EventManager/StaticIntegrationTest.php | 8 +-- tests/Zend/ExceptionTest.php | 2 +- tests/Zend/Feed/AbstractFeedTest.php | 8 +-- tests/Zend/Feed/AllTests.php | 4 +- tests/Zend/Feed/ArrayAccessTest.php | 4 +- tests/Zend/Feed/AtomEntryOnlyTest.php | 2 +- tests/Zend/Feed/AtomPublishingTest.php | 6 +- tests/Zend/Feed/CountTest.php | 2 +- tests/Zend/Feed/ElementTest.php | 2 +- tests/Zend/Feed/Entry/AtomTest.php | 2 +- tests/Zend/Feed/Entry/RssTest.php | 2 +- tests/Zend/Feed/ImportTest.php | 4 +- tests/Zend/Feed/IteratorTest.php | 4 +- tests/Zend/Feed/Pubsubhubbub/AllTests.php | 4 +- .../Zend/Feed/Pubsubhubbub/Model/AllTests.php | 4 +- .../Pubsubhubbub/Model/SubscriptionTest.php | 2 +- .../Zend/Feed/Pubsubhubbub/PublisherTest.php | 4 +- .../Feed/Pubsubhubbub/PubsubhubbubTest.php | 7 ++- .../Pubsubhubbub/Subscriber/CallbackTest.php | 6 +- .../Feed/Pubsubhubbub/SubscriberHttpTest.php | 4 +- .../Zend/Feed/Pubsubhubbub/SubscriberTest.php | 4 +- .../Reader/Entry/AtomStandaloneEntryTest.php | 6 +- tests/Zend/Feed/Reader/Entry/AtomTest.php | 6 +- tests/Zend/Feed/Reader/Entry/CommonTest.php | 4 +- tests/Zend/Feed/Reader/Entry/RssTest.php | 6 +- .../Zend/Feed/Reader/Feed/AtomSourceTest.php | 6 +- tests/Zend/Feed/Reader/Feed/AtomTest.php | 6 +- tests/Zend/Feed/Reader/Feed/CommonTest.php | 4 +- tests/Zend/Feed/Reader/Feed/RssTest.php | 6 +- .../Integration/H-OnlineComAtom10Test.php | 6 +- .../Feed/Reader/Integration/LautDeRdfTest.php | 6 +- .../Reader/Integration/PodcastRss2Test.php | 6 +- .../Integration/WordpressAtom10Test.php | 6 +- .../Integration/WordpressRss2DcAtomTest.php | 4 +- tests/Zend/Feed/ReaderTest.php | 6 +- tests/Zend/Feed/Writer/DeletedTest.php | 5 +- tests/Zend/Feed/Writer/EntryTest.php | 4 +- .../Writer/Extension/ITunes/EntryTest.php | 2 +- .../Feed/Writer/Extension/ITunes/FeedTest.php | 2 +- tests/Zend/Feed/Writer/FeedTest.php | 4 +- .../Feed/Writer/Renderer/Entry/AtomTest.php | 6 +- .../Feed/Writer/Renderer/Entry/RssTest.php | 6 +- .../Feed/Writer/Renderer/Feed/AtomTest.php | 6 +- .../Feed/Writer/Renderer/Feed/RssTest.php | 6 +- tests/Zend/File/AllTests.php | 4 +- tests/Zend/File/ClassFileLocatorTest.php | 4 +- .../File/Transfer/Adapter/AbstractTest.php | 10 +-- tests/Zend/File/Transfer/Adapter/AllTests.php | 4 +- tests/Zend/File/Transfer/Adapter/HttpTest.php | 10 +-- tests/Zend/File/Transfer/AllTests.php | 4 +- tests/Zend/Filter/AllTests.php | 4 +- tests/Zend/Filter/AlnumTest.php | 4 +- tests/Zend/Filter/AlphaTest.php | 4 +- tests/Zend/Filter/BaseNameTest.php | 4 +- tests/Zend/Filter/BooleanTest.php | 4 +- tests/Zend/Filter/CallbackTest.php | 2 +- tests/Zend/Filter/Compress/AllTests.php | 4 +- tests/Zend/Filter/Compress/Bz2Test.php | 10 +-- tests/Zend/Filter/Compress/GzTest.php | 10 +-- tests/Zend/Filter/Compress/LzfTest.php | 8 +-- tests/Zend/Filter/Compress/RarTest.php | 10 +-- tests/Zend/Filter/Compress/TarTest.php | 10 +-- tests/Zend/Filter/Compress/ZipTest.php | 10 +-- tests/Zend/Filter/CompressTest.php | 10 +-- tests/Zend/Filter/DecompressTest.php | 10 +-- tests/Zend/Filter/DecryptTest.php | 4 +- tests/Zend/Filter/DigitsTest.php | 4 +- tests/Zend/Filter/DirTest.php | 4 +- tests/Zend/Filter/Encrypt/AllTests.php | 4 +- tests/Zend/Filter/Encrypt/McryptTest.php | 4 +- tests/Zend/Filter/Encrypt/OpensslTest.php | 18 ++++-- tests/Zend/Filter/EncryptTest.php | 4 +- tests/Zend/Filter/File/AllTests.php | 4 +- tests/Zend/Filter/File/DecryptTest.php | 6 +- tests/Zend/Filter/File/EncryptTest.php | 6 +- tests/Zend/Filter/File/LowerCaseTest.php | 8 ++- tests/Zend/Filter/File/RenameTest.php | 10 +-- tests/Zend/Filter/File/UpperCaseTest.php | 8 ++- tests/Zend/Filter/HtmlEntitiesTest.php | 4 +- tests/Zend/Filter/InflectorTest.php | 10 +-- tests/Zend/Filter/InputTest.php | 2 +- tests/Zend/Filter/IntTest.php | 4 +- .../Zend/Filter/LocalizedToNormalizedTest.php | 2 +- .../Zend/Filter/NormalizedToLocalizedTest.php | 2 +- tests/Zend/Filter/NullTest.php | 4 +- tests/Zend/Filter/PregReplaceTest.php | 8 +-- tests/Zend/Filter/RealPathTest.php | 4 +- tests/Zend/Filter/StringToLowerTest.php | 4 +- tests/Zend/Filter/StringToUpperTest.php | 4 +- tests/Zend/Filter/StringTrimTest.php | 4 +- tests/Zend/Filter/StripNewlinesTest.php | 4 +- tests/Zend/Filter/StripTagsTest.php | 6 +- tests/Zend/Filter/Word/AllTests.php | 4 +- .../Zend/Filter/Word/CamelCaseToDashTest.php | 6 +- .../Filter/Word/CamelCaseToSeparatorTest.php | 6 +- .../Filter/Word/CamelCaseToUnderscoreTest.php | 6 +- .../Zend/Filter/Word/DashToCamelCaseTest.php | 6 +- .../Zend/Filter/Word/DashToSeparatorTest.php | 6 +- .../Zend/Filter/Word/DashToUnderscoreTest.php | 6 +- .../Filter/Word/SeparatorToCamelCaseTest.php | 6 +- .../Zend/Filter/Word/SeparatorToDashTest.php | 6 +- .../Filter/Word/SeparatorToSeparatorTest.php | 6 +- .../Filter/Word/UnderscoreToCamelCaseTest.php | 6 +- .../Zend/Filter/Word/UnderscoreToDashTest.php | 6 +- .../Filter/Word/UnderscoreToSeparatorTest.php | 6 +- tests/Zend/FilterTest.php | 6 +- tests/Zend/Form/AllTests.php | 4 +- tests/Zend/Form/Decorator/AbstractTest.php | 10 +-- tests/Zend/Form/Decorator/AllTests.php | 4 +- tests/Zend/Form/Decorator/CallbackTest.php | 10 +-- tests/Zend/Form/Decorator/DescriptionTest.php | 10 +-- tests/Zend/Form/Decorator/ErrorsTest.php | 10 +-- tests/Zend/Form/Decorator/FieldsetTest.php | 10 +-- tests/Zend/Form/Decorator/FileTest.php | 10 +-- tests/Zend/Form/Decorator/FormErrorsTest.php | 10 +-- tests/Zend/Form/Decorator/FormTest.php | 10 +-- tests/Zend/Form/Decorator/HtmlTagTest.php | 10 +-- tests/Zend/Form/Decorator/ImageTest.php | 10 +-- tests/Zend/Form/Decorator/LabelTest.php | 10 +-- .../Form/Decorator/PrepareElementsTest.php | 10 +-- tests/Zend/Form/Decorator/ReCaptchaTest.php | 8 +-- tests/Zend/Form/Decorator/ViewHelperTest.php | 10 +-- tests/Zend/Form/Decorator/ViewScriptTest.php | 10 +-- tests/Zend/Form/DisplayGroupTest.php | 10 +-- tests/Zend/Form/Element/AllTests.php | 4 +- tests/Zend/Form/Element/ButtonTest.php | 10 +-- tests/Zend/Form/Element/CaptchaTest.php | 10 +-- tests/Zend/Form/Element/CheckboxTest.php | 10 +-- tests/Zend/Form/Element/FileTest.php | 10 +-- tests/Zend/Form/Element/HashTest.php | 10 +-- tests/Zend/Form/Element/HiddenTest.php | 10 +-- tests/Zend/Form/Element/ImageTest.php | 10 +-- tests/Zend/Form/Element/MultiCheckboxTest.php | 10 +-- tests/Zend/Form/Element/MultiselectTest.php | 10 +-- tests/Zend/Form/Element/NoteTest.php | 10 +-- tests/Zend/Form/Element/PasswordTest.php | 10 +-- tests/Zend/Form/Element/RadioTest.php | 10 +-- tests/Zend/Form/Element/ResetTest.php | 10 +-- tests/Zend/Form/Element/SelectTest.php | 10 +-- tests/Zend/Form/Element/SubmitTest.php | 10 +-- tests/Zend/Form/Element/TextTest.php | 10 +-- tests/Zend/Form/Element/TextareaTest.php | 10 +-- tests/Zend/Form/ElementTest.php | 10 +-- tests/Zend/Form/FormTest.php | 10 +-- tests/Zend/Form/SubFormTest.php | 10 +-- tests/Zend/Gdata/AllTests.php | 4 +- .../Zend/Gdata/Analytics/AccountFeedTest.php | 4 +- .../Zend/Gdata/Analytics/AccountQueryTest.php | 4 +- tests/Zend/Gdata/Analytics/DataFeedTest.php | 4 +- tests/Zend/Gdata/Analytics/DataQueryTest.php | 4 +- tests/Zend/Gdata/App/AuthorTest.php | 4 +- tests/Zend/Gdata/App/BaseTest.php | 4 +- .../App/CaptchaRequiredExceptionTest.php | 4 +- tests/Zend/Gdata/App/CategoryTest.php | 4 +- tests/Zend/Gdata/App/ContentTest.php | 4 +- tests/Zend/Gdata/App/ControlTest.php | 4 +- tests/Zend/Gdata/App/EntryTest.php | 4 +- tests/Zend/Gdata/App/FeedTest.php | 4 +- tests/Zend/Gdata/App/GeneratorTest.php | 4 +- tests/Zend/Gdata/App/HttpExceptionTest.php | 4 +- tests/Zend/Gdata/App/UtilTest.php | 2 +- tests/Zend/Gdata/AppTest.php | 4 +- tests/Zend/Gdata/AttendeeStatusTest.php | 4 +- tests/Zend/Gdata/AttendeeTypeTest.php | 4 +- tests/Zend/Gdata/AuthSubTest.php | 4 +- .../Zend/Gdata/Books/CollectionEntryTest.php | 4 +- tests/Zend/Gdata/Books/CollectionFeedTest.php | 4 +- tests/Zend/Gdata/Books/VolumeEntryTest.php | 4 +- tests/Zend/Gdata/Books/VolumeFeedTest.php | 4 +- tests/Zend/Gdata/BooksOnlineTest.php | 4 +- tests/Zend/Gdata/BooksTest.php | 4 +- tests/Zend/Gdata/Calendar/AccessLevelTest.php | 4 +- tests/Zend/Gdata/Calendar/ColorTest.php | 4 +- tests/Zend/Gdata/Calendar/EventEntryTest.php | 4 +- .../Calendar/EventQueryExceptionTest.php | 4 +- tests/Zend/Gdata/Calendar/EventQueryTest.php | 4 +- tests/Zend/Gdata/Calendar/HiddenTest.php | 4 +- tests/Zend/Gdata/Calendar/LinkTest.php | 4 +- tests/Zend/Gdata/Calendar/QuickAddTest.php | 4 +- tests/Zend/Gdata/Calendar/SelectedTest.php | 4 +- .../Calendar/SendEventNotificationsTest.php | 4 +- tests/Zend/Gdata/Calendar/TimezoneTest.php | 4 +- tests/Zend/Gdata/Calendar/WebContentTest.php | 4 +- tests/Zend/Gdata/CalendarEventTest.php | 4 +- .../Zend/Gdata/CalendarFeedCompositeTest.php | 4 +- tests/Zend/Gdata/CalendarFeedTest.php | 4 +- tests/Zend/Gdata/CalendarOnlineTest.php | 4 +- tests/Zend/Gdata/CalendarTest.php | 4 +- tests/Zend/Gdata/CommentsTest.php | 4 +- .../Zend/Gdata/Docs/DocumentListEntryTest.php | 4 +- .../Zend/Gdata/Docs/DocumentListFeedTest.php | 4 +- tests/Zend/Gdata/Docs/QueryTest.php | 4 +- tests/Zend/Gdata/DocsOnlineTest.php | 4 +- tests/Zend/Gdata/DocsTest.php | 4 +- tests/Zend/Gdata/EntryLinkTest.php | 4 +- tests/Zend/Gdata/EntryTest.php | 4 +- tests/Zend/Gdata/EventStatusTest.php | 4 +- tests/Zend/Gdata/ExtendedPropertyTest.php | 4 +- tests/Zend/Gdata/FeedLinkTest.php | 4 +- tests/Zend/Gdata/FeedTest.php | 4 +- tests/Zend/Gdata/Gapps/EmailListEntryTest.php | 4 +- tests/Zend/Gdata/Gapps/EmailListFeedTest.php | 4 +- tests/Zend/Gdata/Gapps/EmailListQueryTest.php | 4 +- .../Gapps/EmailListRecipientEntryTest.php | 4 +- .../Gapps/EmailListRecipientFeedTest.php | 4 +- .../Gapps/EmailListRecipientQueryTest.php | 4 +- tests/Zend/Gdata/Gapps/EmailListTest.php | 4 +- tests/Zend/Gdata/Gapps/ErrorTest.php | 4 +- tests/Zend/Gdata/Gapps/GroupEntryTest.php | 4 +- tests/Zend/Gdata/Gapps/GroupFeedTest.php | 4 +- tests/Zend/Gdata/Gapps/GroupQueryTest.php | 4 +- tests/Zend/Gdata/Gapps/LoginTest.php | 4 +- tests/Zend/Gdata/Gapps/MemberEntryTest.php | 4 +- tests/Zend/Gdata/Gapps/MemberFeedTest.php | 4 +- tests/Zend/Gdata/Gapps/MemberQueryTest.php | 4 +- tests/Zend/Gdata/Gapps/NameTest.php | 4 +- tests/Zend/Gdata/Gapps/NicknameEntryTest.php | 4 +- tests/Zend/Gdata/Gapps/NicknameFeedTest.php | 4 +- tests/Zend/Gdata/Gapps/NicknameQueryTest.php | 4 +- tests/Zend/Gdata/Gapps/NicknameTest.php | 4 +- tests/Zend/Gdata/Gapps/OwnerEntryTest.php | 4 +- tests/Zend/Gdata/Gapps/OwnerFeedTest.php | 4 +- tests/Zend/Gdata/Gapps/OwnerQueryTest.php | 4 +- tests/Zend/Gdata/Gapps/PropertyTest.php | 4 +- tests/Zend/Gdata/Gapps/QuotaTest.php | 4 +- .../Zend/Gdata/Gapps/ServiceExceptionTest.php | 4 +- tests/Zend/Gdata/Gapps/UserEntryTest.php | 4 +- tests/Zend/Gdata/Gapps/UserFeedTest.php | 4 +- tests/Zend/Gdata/Gapps/UserQueryTest.php | 4 +- tests/Zend/Gdata/GappsOnlineTest.php | 6 +- tests/Zend/Gdata/GappsTest.php | 4 +- tests/Zend/Gdata/GdataOnlineTest.php | 4 +- tests/Zend/Gdata/GdataTest.php | 2 +- tests/Zend/Gdata/MediaMimeStreamTest.php | 4 +- .../Zend/Gdata/OpenSearchItemsPerPageTest.php | 4 +- tests/Zend/Gdata/OpenSearchStartIndexTest.php | 4 +- .../Zend/Gdata/OpenSearchTotalResultsTest.php | 4 +- tests/Zend/Gdata/OriginalEventTest.php | 4 +- .../Gdata/Photos/PhotosAlbumEntryTest.php | 4 +- .../Zend/Gdata/Photos/PhotosAlbumFeedTest.php | 4 +- .../Gdata/Photos/PhotosAlbumQueryTest.php | 2 +- .../Gdata/Photos/PhotosCommentEntryTest.php | 4 +- .../Gdata/Photos/PhotosPhotoEntryTest.php | 4 +- .../Zend/Gdata/Photos/PhotosPhotoFeedTest.php | 4 +- .../Gdata/Photos/PhotosPhotoQueryTest.php | 2 +- .../Zend/Gdata/Photos/PhotosTagEntryTest.php | 4 +- .../Zend/Gdata/Photos/PhotosUserEntryTest.php | 4 +- .../Zend/Gdata/Photos/PhotosUserFeedTest.php | 4 +- .../Zend/Gdata/Photos/PhotosUserQueryTest.php | 2 +- tests/Zend/Gdata/PhotosOnlineTest.php | 4 +- tests/Zend/Gdata/QueryTest.php | 4 +- tests/Zend/Gdata/RecurrenceExceptionTest.php | 4 +- tests/Zend/Gdata/RecurrenceTest.php | 4 +- tests/Zend/Gdata/ReminderTest.php | 4 +- tests/Zend/Gdata/SkipTests.php | 6 +- .../Zend/Gdata/Spreadsheets/CellEntryTest.php | 4 +- .../Zend/Gdata/Spreadsheets/CellFeedTest.php | 4 +- .../Zend/Gdata/Spreadsheets/CellQueryTest.php | 4 +- tests/Zend/Gdata/Spreadsheets/CellTest.php | 4 +- .../Zend/Gdata/Spreadsheets/ColCountTest.php | 4 +- tests/Zend/Gdata/Spreadsheets/CustomTest.php | 4 +- .../Gdata/Spreadsheets/DocumentQueryTest.php | 4 +- .../Zend/Gdata/Spreadsheets/ListEntryTest.php | 4 +- .../Zend/Gdata/Spreadsheets/ListFeedTest.php | 4 +- .../Zend/Gdata/Spreadsheets/ListQueryTest.php | 4 +- .../Zend/Gdata/Spreadsheets/RowCountTest.php | 4 +- .../Spreadsheets/SpreadsheetFeedTest.php | 4 +- .../Gdata/Spreadsheets/WorksheetEntryTest.php | 4 +- .../Gdata/Spreadsheets/WorksheetFeedTest.php | 4 +- tests/Zend/Gdata/SpreadsheetsOnlineTest.php | 4 +- tests/Zend/Gdata/SpreadsheetsTest.php | 4 +- tests/Zend/Gdata/TransparencyTest.php | 4 +- tests/Zend/Gdata/VisibilityTest.php | 4 +- tests/Zend/Gdata/WhenTest.php | 4 +- tests/Zend/Gdata/WhereTest.php | 4 +- tests/Zend/Gdata/WhoTest.php | 4 +- tests/Zend/Http/AllTests.php | 4 +- tests/Zend/Http/Client/AllTests.php | 4 +- tests/Zend/Http/Client/ClientTest.php | 4 +- tests/Zend/Http/Client/CommonHttpTests.php | 6 +- tests/Zend/Http/Client/CurlTest.php | 8 +-- tests/Zend/Http/Client/ProxyAdapterTest.php | 10 +-- tests/Zend/Http/Client/SkipTests.php | 6 +- tests/Zend/Http/Client/StaticTest.php | 6 +- tests/Zend/Http/Client/TestAdapterTest.php | 6 +- tests/Zend/Http/CookieJarTest.php | 2 +- tests/Zend/Http/CookieTest.php | 5 +- tests/Zend/Http/Header/AllTests.php | 4 +- tests/Zend/Http/Header/HeaderValueTest.php | 2 +- tests/Zend/Http/Header/SetCookieTest.php | 2 +- tests/Zend/Http/ResponseTest.php | 6 +- .../Http/UserAgent/AbstractDeviceTest.php | 2 +- tests/Zend/Http/UserAgent/AllTests.php | 4 +- .../Features/Adapter/BrowscapTest.php | 8 +-- .../Features/Adapter/DeviceAtlasTest.php | 4 +- .../Features/Adapter/TeraWurflTest.php | 4 +- tests/Zend/Http/UserAgentTest.php | 4 +- tests/Zend/Json/AllTests.php | 4 +- tests/Zend/Json/JsonXMLTest.php | 2 +- tests/Zend/Json/Server/AllTests.php | 4 +- tests/Zend/Json/Server/CacheTest.php | 10 +-- tests/Zend/Json/Server/ErrorTest.php | 10 +-- tests/Zend/Json/Server/RequestTest.php | 10 +-- tests/Zend/Json/Server/ResponseTest.php | 10 +-- tests/Zend/Json/Server/Smd/ServiceTest.php | 10 +-- tests/Zend/Json/Server/SmdTest.php | 10 +-- tests/Zend/Json/ServerTest.php | 10 +-- tests/Zend/JsonTest.php | 6 +- tests/Zend/Layout/AllTests.php | 4 +- tests/Zend/Layout/FunctionalTest.php | 8 +-- tests/Zend/Layout/HelperTest.php | 10 +-- tests/Zend/Layout/LayoutTest.php | 10 +-- tests/Zend/Layout/PluginTest.php | 10 +-- tests/Zend/Ldap/AllTests.php | 8 +-- tests/Zend/Ldap/AttributeTest.php | 2 +- tests/Zend/Ldap/BindTest.php | 4 +- tests/Zend/Ldap/CanonTest.php | 4 +- tests/Zend/Ldap/ConnectTest.php | 4 +- tests/Zend/Ldap/ConverterTest.php | 2 +- tests/Zend/Ldap/CopyRenameTest.php | 8 +-- tests/Zend/Ldap/Dn/AllTests.php | 4 +- tests/Zend/Ldap/Dn/CreationTest.php | 2 +- tests/Zend/Ldap/Dn/EscapingTest.php | 2 +- tests/Zend/Ldap/Dn/ExplodingTest.php | 2 +- tests/Zend/Ldap/Dn/ImplodingTest.php | 2 +- tests/Zend/Ldap/Dn/MiscTest.php | 2 +- tests/Zend/Ldap/Dn/ModificationTest.php | 2 +- tests/Zend/Ldap/FilterTest.php | 2 +- tests/Zend/Ldap/Ldif/AllTests.php | 8 +-- tests/Zend/Ldap/Node/AllTests.php | 8 +-- .../Zend/Ldap/Node/ChildrenIterationTest.php | 8 +-- tests/Zend/Ldap/Node/ChildrenTest.php | 8 +-- tests/Zend/Ldap/Node/OnlineTest.php | 8 +-- tests/Zend/Ldap/Node/SchemaTest.php | 4 +- tests/Zend/Ldap/Node/UpdateTest.php | 8 +-- tests/Zend/Ldap/OfflineTest.php | 4 +- tests/Zend/Ldap/OnlineTestCase.php | 4 +- tests/Zend/Ldap/OriginalBindTest.php | 4 +- tests/Zend/Ldap/OriginalCanonTest.php | 4 +- tests/Zend/Ldap/OriginalConnectTest.php | 4 +- tests/Zend/Ldap/OriginalOfflineTest.php | 4 +- tests/Zend/Ldap/SearchTest.php | 8 +-- tests/Zend/Ldap/SortTest.php | 8 +-- tests/Zend/Ldap/TestCase.php | 2 +- tests/Zend/Loader/AllTests.php | 4 +- tests/Zend/Loader/Autoloader/ResourceTest.php | 10 +-- .../AutoloaderFactoryClassMapLoaderTest.php | 10 +-- tests/Zend/Loader/AutoloaderFactoryTest.php | 10 +-- .../Loader/AutoloaderMultiVersionTest.php | 10 +-- tests/Zend/Loader/AutoloaderTest.php | 10 +-- tests/Zend/Loader/ClassMapAutoloaderTest.php | 10 +-- tests/Zend/Loader/PluginLoaderTest.php | 8 +-- tests/Zend/Loader/StandardAutoloaderTest.php | 8 +-- tests/Zend/LoaderTest.php | 8 +-- tests/Zend/Locale/AllTests.php | 4 +- tests/Zend/Locale/DataTest.php | 6 +- tests/Zend/Locale/FormatTest.php | 4 +- tests/Zend/Locale/MathTest.php | 6 +- tests/Zend/LocaleTest.php | 12 ++-- tests/Zend/Log/AllTests.php | 4 +- tests/Zend/Log/Filter/AllTests.php | 4 +- tests/Zend/Log/Filter/ChainingTest.php | 10 +-- tests/Zend/Log/Filter/MessageTest.php | 6 +- tests/Zend/Log/Filter/PriorityTest.php | 6 +- tests/Zend/Log/Filter/SuppressTest.php | 8 +-- tests/Zend/Log/Formatter/AllTests.php | 4 +- tests/Zend/Log/Formatter/FirebugTest.php | 6 +- tests/Zend/Log/Formatter/SimpleTest.php | 6 +- tests/Zend/Log/Formatter/XmlTest.php | 6 +- tests/Zend/Log/LogTest.php | 8 +-- tests/Zend/Log/Writer/AbstractTest.php | 8 +-- tests/Zend/Log/Writer/AllTests.php | 4 +- tests/Zend/Log/Writer/DbTest.php | 8 +-- tests/Zend/Log/Writer/FirebugTest.php | 10 +-- tests/Zend/Log/Writer/MailTest.php | 18 +++--- tests/Zend/Log/Writer/MockTest.php | 6 +- tests/Zend/Log/Writer/NullTest.php | 6 +- tests/Zend/Log/Writer/StreamTest.php | 6 +- tests/Zend/Log/Writer/SyslogTest.php | 6 +- tests/Zend/Log/Writer/ZendMonitorTest.php | 6 +- tests/Zend/Mail/AllTests.php | 4 +- tests/Zend/Mail/FileTransportTest.php | 6 +- tests/Zend/Mail/Header/AllTests.php | 4 +- tests/Zend/Mail/Header/HeaderNameTest.php | 2 +- tests/Zend/Mail/Header/HeaderValueTest.php | 2 +- tests/Zend/Mail/ImapTest.php | 4 +- tests/Zend/Mail/InterfaceTest.php | 4 +- tests/Zend/Mail/MailTest.php | 4 +- tests/Zend/Mail/MaildirFolderTest.php | 6 +- tests/Zend/Mail/MaildirMessageOldTest.php | 6 +- tests/Zend/Mail/MaildirTest.php | 6 +- tests/Zend/Mail/MaildirWritableTest.php | 10 +-- tests/Zend/Mail/MboxFolderTest.php | 6 +- tests/Zend/Mail/MboxMessageOldTest.php | 6 +- tests/Zend/Mail/MboxTest.php | 6 +- tests/Zend/Mail/MessageTest.php | 6 +- tests/Zend/Mail/Pop3Test.php | 4 +- tests/Zend/Mail/SmtpOfflineTest.php | 4 +- tests/Zend/Mail/SmtpProtocolTest.php | 4 +- tests/Zend/Mail/SmtpTest.php | 4 +- tests/Zend/Markup/AllTests.php | 4 +- tests/Zend/Markup/BbcodeAndHtmlTest.php | 10 +-- tests/Zend/Markup/FactoryTest.php | 4 +- tests/Zend/Markup/ParserIntegrityTest.php | 6 +- tests/Zend/Measure/AccelerationTest.php | 2 +- tests/Zend/Measure/AllTests.php | 4 +- tests/Zend/Measure/AngleTest.php | 2 +- tests/Zend/Measure/AreaTest.php | 2 +- tests/Zend/Measure/BinaryTest.php | 2 +- tests/Zend/Measure/CapacitanceTest.php | 2 +- tests/Zend/Measure/Cooking/VolumeTest.php | 2 +- tests/Zend/Measure/Cooking/WeightTest.php | 2 +- tests/Zend/Measure/CurrentTest.php | 2 +- tests/Zend/Measure/DensityTest.php | 2 +- tests/Zend/Measure/EnergyTest.php | 2 +- tests/Zend/Measure/Flow/MassTest.php | 2 +- tests/Zend/Measure/Flow/MoleTest.php | 2 +- tests/Zend/Measure/Flow/VolumeTest.php | 2 +- tests/Zend/Measure/ForceTest.php | 2 +- tests/Zend/Measure/FrequencyTest.php | 2 +- tests/Zend/Measure/IlluminationTest.php | 2 +- tests/Zend/Measure/LengthTest.php | 2 +- tests/Zend/Measure/LightnessTest.php | 2 +- tests/Zend/Measure/NumberTest.php | 2 +- tests/Zend/Measure/PowerTest.php | 2 +- tests/Zend/Measure/PressureTest.php | 2 +- tests/Zend/Measure/SpeedTest.php | 2 +- tests/Zend/Measure/TemperatureTest.php | 10 +-- tests/Zend/Measure/TimeTest.php | 2 +- tests/Zend/Measure/TorqueTest.php | 2 +- tests/Zend/Measure/Viscosity/DynamicTest.php | 2 +- .../Zend/Measure/Viscosity/KinematicTest.php | 2 +- tests/Zend/Measure/VolumeTest.php | 4 +- tests/Zend/Measure/WeightTest.php | 2 +- tests/Zend/Memory/AccessControllerTest.php | 8 +-- tests/Zend/Memory/AllTests.php | 4 +- tests/Zend/Memory/LockedTest.php | 2 +- tests/Zend/Memory/MemoryManagerTest.php | 8 +-- tests/Zend/Memory/MemoryTest.php | 8 +-- tests/Zend/Memory/MovableTest.php | 2 +- tests/Zend/Memory/ValueTest.php | 2 +- tests/Zend/Mime/AllTests.php | 4 +- tests/Zend/Mime/MessageTest.php | 2 +- tests/Zend/Mime/PartTest.php | 4 +- tests/Zend/MimeTest.php | 2 +- tests/Zend/Mobile/AllTests.php | 4 +- tests/Zend/Mobile/Push/AbstractTest.php | 4 +- tests/Zend/Mobile/Push/AllTests.php | 4 +- tests/Zend/Mobile/Push/ApnsTest.php | 4 +- tests/Zend/Mobile/Push/GcmTest.php | 4 +- .../Zend/Mobile/Push/Message/AbstractTest.php | 4 +- tests/Zend/Mobile/Push/Message/AllTests.php | 4 +- tests/Zend/Mobile/Push/Message/ApnsTest.php | 4 +- tests/Zend/Mobile/Push/Message/GcmTest.php | 2 +- .../Mobile/Push/Message/Mpns/AllTests.php | 4 +- .../Zend/Mobile/Push/Message/Mpns/RawTest.php | 4 +- .../Mobile/Push/Message/Mpns/TileTest.php | 4 +- .../Mobile/Push/Message/Mpns/ToastTest.php | 4 +- tests/Zend/Mobile/Push/MpnsTest.php | 4 +- tests/Zend/Mobile/Push/Response/AllTests.php | 4 +- tests/Zend/Mobile/Push/Response/GcmTest.php | 2 +- tests/Zend/Navigation/AllTests.php | 4 +- tests/Zend/Navigation/ContainerTest.php | 6 +- tests/Zend/Navigation/Page/AllTests.php | 4 +- tests/Zend/Navigation/Page/MvcTest.php | 6 +- tests/Zend/Navigation/Page/UriTest.php | 2 +- tests/Zend/Navigation/PageFactoryTest.php | 6 +- tests/Zend/Navigation/PageTest.php | 6 +- tests/Zend/NavigationTest.php | 12 ++-- tests/Zend/Oauth/AllTests.php | 4 +- tests/Zend/Oauth/ClientTest.php | 4 +- tests/Zend/Oauth/ConfigTest.php | 4 +- tests/Zend/Oauth/Oauth/ConsumerTest.php | 4 +- .../Zend/Oauth/Oauth/Http/AccessTokenTest.php | 6 +- .../Oauth/Oauth/Http/RequestTokenTest.php | 6 +- .../Oauth/Http/UserAuthorizationTest.php | 4 +- tests/Zend/Oauth/Oauth/Http/UtilityTest.php | 2 +- .../Oauth/Oauth/Signature/AbstractTest.php | 2 +- tests/Zend/Oauth/Oauth/Signature/HmacTest.php | 2 +- .../Oauth/Oauth/Signature/PlaintextTest.php | 2 +- tests/Zend/Oauth/Oauth/Signature/RsaTest.php | 2 +- tests/Zend/Oauth/Oauth/Token/AccessTest.php | 2 +- .../Oauth/Token/AuthorizedRequestTest.php | 2 +- tests/Zend/Oauth/Oauth/Token/RequestTest.php | 2 +- tests/Zend/Oauth/OauthTest.php | 4 +- tests/Zend/OpenId/AllTests.php | 4 +- .../Zend/OpenId/Consumer/Storage/FileTest.php | 6 +- tests/Zend/OpenId/ConsumerTest.php | 2 +- tests/Zend/OpenId/Extension/SregTest.php | 2 +- tests/Zend/OpenId/ExtensionTest.php | 2 +- .../Zend/OpenId/Provider/Storage/FileTest.php | 2 +- .../Zend/OpenId/Provider/User/SessionTest.php | 4 +- tests/Zend/OpenId/ProviderTest.php | 2 +- tests/Zend/OpenIdTest.php | 6 +- tests/Zend/Paginator/Adapter/ArrayTest.php | 10 +-- .../Paginator/Adapter/DbSelect/OracleTest.php | 4 +- tests/Zend/Paginator/Adapter/DbSelectTest.php | 10 +-- tests/Zend/Paginator/Adapter/IteratorTest.php | 10 +-- tests/Zend/Paginator/Adapter/NullTest.php | 10 +-- tests/Zend/Paginator/AllTests.php | 4 +- .../Zend/Paginator/ScrollingStyle/AllTest.php | 10 +-- .../Paginator/ScrollingStyle/ElasticTest.php | 10 +-- .../Paginator/ScrollingStyle/JumpingTest.php | 10 +-- .../Paginator/ScrollingStyle/SlidingTest.php | 10 +-- tests/Zend/PaginatorTest.php | 8 +-- tests/Zend/Pdf/ActionTest.php | 4 +- tests/Zend/Pdf/AllTests.php | 4 +- tests/Zend/Pdf/DestinationTest.php | 4 +- tests/Zend/Pdf/DrawingTest.php | 4 +- tests/Zend/Pdf/Element/AllTests.php | 4 +- tests/Zend/Pdf/Element/ArrayTest.php | 2 +- tests/Zend/Pdf/Element/BooleanTest.php | 2 +- tests/Zend/Pdf/Element/DictionaryTest.php | 2 +- tests/Zend/Pdf/Element/NameTest.php | 2 +- tests/Zend/Pdf/Element/NullTest.php | 2 +- tests/Zend/Pdf/Element/NumericTest.php | 2 +- tests/Zend/Pdf/Element/Object/AllTests.php | 4 +- tests/Zend/Pdf/Element/Object/StreamTest.php | 2 +- tests/Zend/Pdf/Element/ObjectTest.php | 2 +- tests/Zend/Pdf/Element/StreamTest.php | 2 +- tests/Zend/Pdf/Element/String/AllTests.php | 4 +- tests/Zend/Pdf/Element/String/BinaryTest.php | 2 +- tests/Zend/Pdf/Element/StringTest.php | 2 +- tests/Zend/Pdf/FactoryTest.php | 2 +- tests/Zend/Pdf/Filter/AllTests.php | 4 +- tests/Zend/Pdf/Filter/Ascii85Test.php | 2 +- .../Zend/Pdf/Filter/Compression/FlateTest.php | 4 +- tests/Zend/Pdf/Filter/RunLengthTest.php | 2 +- tests/Zend/Pdf/NamedDestinationsTest.php | 4 +- tests/Zend/Pdf/ProcessingTest.php | 4 +- tests/Zend/PdfTest.php | 4 +- tests/Zend/ProgressBar/Adapter/AllTests.php | 4 +- .../Zend/ProgressBar/Adapter/ConsoleTest.php | 10 +-- tests/Zend/ProgressBar/Adapter/JsPullTest.php | 6 +- tests/Zend/ProgressBar/Adapter/JsPushTest.php | 6 +- tests/Zend/ProgressBar/AllTests.php | 4 +- tests/Zend/ProgressBar/ProgressBarTest.php | 6 +- .../Queue/Adapter/ActivemqOfflineTest.php | 2 +- tests/Zend/Queue/Adapter/ActivemqTest.php | 4 +- tests/Zend/Queue/Adapter/AdapterTest.php | 4 +- tests/Zend/Queue/Adapter/DbTest.php | 4 +- tests/Zend/Queue/Adapter/MemcacheqTest.php | 4 +- .../Queue/Adapter/PlatformJobQueueTest.php | 2 +- tests/Zend/Queue/AllTests.php | 4 +- tests/Zend/Queue/CustomTest.php | 2 +- tests/Zend/Queue/FactoryTest.php | 4 +- tests/Zend/Queue/Message/IteratorTest.php | 6 +- tests/Zend/Queue/MessageTest.php | 6 +- tests/Zend/Queue/Queue1Test.php | 2 +- tests/Zend/Queue/Queue2Test.php | 2 +- tests/Zend/Queue/QueueBaseTest.php | 6 +- tests/Zend/Queue/QueueTest.php | 6 +- tests/Zend/Queue/Stomp/ClientTest.php | 2 +- tests/Zend/Queue/Stomp/FrameTest.php | 2 +- tests/Zend/Reflection/AllTests.php | 4 +- tests/Zend/Reflection/ClassTest.php | 4 +- tests/Zend/Reflection/Docblock/AllTests.php | 4 +- .../Reflection/Docblock/Tag/ParamTest.php | 4 +- .../Reflection/Docblock/Tag/ReturnTest.php | 4 +- tests/Zend/Reflection/Docblock/TagTest.php | 4 +- tests/Zend/Reflection/DocblockTest.php | 4 +- tests/Zend/Reflection/ExtensionTest.php | 2 +- tests/Zend/Reflection/FileTest.php | 2 +- tests/Zend/Reflection/FunctionTest.php | 4 +- tests/Zend/Reflection/MethodTest.php | 4 +- tests/Zend/Reflection/ParameterTest.php | 4 +- tests/Zend/Reflection/PropertyTest.php | 4 +- tests/Zend/RegistryTest.php | 6 +- tests/Zend/Rest/AllTests.php | 4 +- tests/Zend/Rest/ClientTest.php | 4 +- tests/Zend/Rest/ControllerTest.php | 8 +-- tests/Zend/Rest/ResultTest.php | 4 +- tests/Zend/Rest/RouteTest.php | 8 +-- tests/Zend/Rest/ServerTest.php | 8 +-- tests/Zend/Search/AllTests.php | 4 +- tests/Zend/Search/Lucene/AllTests.php | 4 +- tests/Zend/Search/Lucene/AnalysisTest.php | 2 +- tests/Zend/Search/Lucene/DocumentTest.php | 2 +- tests/Zend/Search/Lucene/FSMTest.php | 2 +- tests/Zend/Search/Lucene/FieldTest.php | 6 +- .../Lucene/Index/DictionaryLoaderTest.php | 2 +- .../Search/Lucene/Index/FieldInfoTest.php | 2 +- .../Search/Lucene/Index/SegmentInfoTest.php | 2 +- .../Search/Lucene/Index/SegmentMergerTest.php | 2 +- .../Zend/Search/Lucene/Index/TermInfoTest.php | 2 +- tests/Zend/Search/Lucene/Index/TermTest.php | 2 +- .../Lucene/Index/TermsPriorityQueueTest.php | 2 +- tests/Zend/Search/Lucene/LuceneTest.php | 8 +-- .../Zend/Search/Lucene/PriorityQueueTest.php | 2 +- tests/Zend/Search/Lucene/Search23Test.php | 2 +- .../Search/Lucene/SearchHighlightTest.php | 6 +- tests/Zend/Search/Lucene/SearchTest.php | 2 +- .../Search/Lucene/Storage/DirectoryTest.php | 2 +- tests/Zend/Search/Lucene/Storage/FileTest.php | 2 +- .../Search/Lucene/Storage/FilesystemTest.php | 4 +- tests/Zend/Serializer/Adapter/AllTests.php | 4 +- tests/Zend/Serializer/Adapter/Amf0Test.php | 6 +- tests/Zend/Serializer/Adapter/Amf3Test.php | 6 +- .../Zend/Serializer/Adapter/IgbinaryTest.php | 8 +-- tests/Zend/Serializer/Adapter/JsonTest.php | 6 +- tests/Zend/Serializer/Adapter/PhpCodeTest.php | 8 +-- .../Serializer/Adapter/PhpSerializeTest.php | 6 +- .../PythonPickleSerializeProtocol0Test.php | 6 +- .../PythonPickleSerializeProtocol1Test.php | 6 +- .../Adapter/PythonPickleUnserializeTest.php | 6 +- tests/Zend/Serializer/Adapter/WddxTest.php | 8 +-- tests/Zend/Serializer/AllTests.php | 4 +- tests/Zend/Serializer/SerializerTest.php | 6 +- tests/Zend/Server/AllTests.php | 4 +- tests/Zend/Server/DefinitionTest.php | 10 +-- tests/Zend/Server/Method/CallbackTest.php | 10 +-- tests/Zend/Server/Method/DefinitionTest.php | 10 +-- tests/Zend/Server/Method/ParameterTest.php | 10 +-- tests/Zend/Server/Method/PrototypeTest.php | 10 +-- tests/Zend/Server/Reflection/ClassTest.php | 2 +- tests/Zend/Server/Reflection/FunctionTest.php | 2 +- tests/Zend/Server/Reflection/MethodTest.php | 4 +- tests/Zend/Server/Reflection/NodeTest.php | 2 +- .../Zend/Server/Reflection/ParameterTest.php | 2 +- .../Zend/Server/Reflection/PrototypeTest.php | 6 +- .../Server/Reflection/ReturnValueTest.php | 2 +- tests/Zend/Server/ReflectionTest.php | 2 +- tests/Zend/Service/AkismetTest.php | 4 +- tests/Zend/Service/AllTests.php | 4 +- tests/Zend/Service/Amazon/AbstractTest.php | 10 +-- tests/Zend/Service/Amazon/AllTests.php | 4 +- .../Amazon/Authentication/AllTests.php | 4 +- .../Service/Amazon/Authentication/S3Test.php | 14 ++--- .../Service/Amazon/Authentication/V1Test.php | 10 +-- .../Service/Amazon/Authentication/V2Test.php | 10 +-- .../Zend/Service/Amazon/Ec2/AbstractTest.php | 10 +-- tests/Zend/Service/Amazon/Ec2/AllTests.php | 4 +- .../Amazon/Ec2/AvailabilityzonesTest.php | 10 +-- .../Service/Amazon/Ec2/CloudWatchTest.php | 10 +-- tests/Zend/Service/Amazon/Ec2/EbsTest.php | 10 +-- tests/Zend/Service/Amazon/Ec2/Ec2Test.php | 10 +-- .../Zend/Service/Amazon/Ec2/ElasticipTest.php | 10 +-- tests/Zend/Service/Amazon/Ec2/ImageTest.php | 10 +-- .../Amazon/Ec2/InstanceReservedTest.php | 10 +-- .../Zend/Service/Amazon/Ec2/InstanceTest.php | 10 +-- .../Amazon/Ec2/InstanceWindowsTest.php | 10 +-- tests/Zend/Service/Amazon/Ec2/KeypairTest.php | 10 +-- tests/Zend/Service/Amazon/Ec2/RegionTest.php | 10 +-- .../Service/Amazon/Ec2/SecuritygroupsTest.php | 10 +-- tests/Zend/Service/Amazon/OfflineTest.php | 4 +- tests/Zend/Service/Amazon/OnlineTest.php | 6 +- tests/Zend/Service/Amazon/S3/AllTests.php | 4 +- tests/Zend/Service/Amazon/S3/OfflineTest.php | 4 +- tests/Zend/Service/Amazon/S3/OnlineTest.php | 8 +-- tests/Zend/Service/Amazon/S3/StreamTest.php | 8 +-- .../Zend/Service/Amazon/SimpleDb/AllTests.php | 4 +- .../Service/Amazon/SimpleDb/OfflineTest.php | 4 +- .../Service/Amazon/SimpleDb/OnlineTest.php | 6 +- .../Zend/Service/Amazon/SimpleDb/PageTest.php | 4 +- tests/Zend/Service/Amazon/Sqs/AllTests.php | 4 +- tests/Zend/Service/Amazon/Sqs/OfflineTest.php | 4 +- tests/Zend/Service/Amazon/Sqs/OnlineTest.php | 8 +-- .../Zend/Service/Audioscrobbler/AllTests.php | 2 +- .../Audioscrobbler/AudioscrobblerTestCase.php | 4 +- tests/Zend/Service/Delicious/AllTests.php | 4 +- tests/Zend/Service/Delicious/PostTest.php | 4 +- .../Service/Delicious/PrivateDataTest.php | 4 +- .../Zend/Service/Delicious/PublicDataTest.php | 4 +- .../Zend/Service/Delicious/SimplePostTest.php | 2 +- tests/Zend/Service/Delicious/SkipTests.php | 4 +- tests/Zend/Service/Ebay/AbstractTest.php | 4 +- tests/Zend/Service/Ebay/AllTests.php | 4 +- tests/Zend/Service/Ebay/Finding/AllTests.php | 4 +- .../Zend/Service/Ebay/Finding/OfflineTest.php | 4 +- .../Zend/Service/Ebay/Finding/OnlineTest.php | 8 +-- tests/Zend/Service/Flickr/AllTests.php | 4 +- tests/Zend/Service/Flickr/OfflineTest.php | 4 +- tests/Zend/Service/Flickr/OnlineTest.php | 4 +- tests/Zend/Service/LiveDocx/AllTests.php | 4 +- tests/Zend/Service/LiveDocx/LiveDocxTest.php | 10 +-- tests/Zend/Service/LiveDocx/MailMergeTest.php | 10 +-- tests/Zend/Service/Rackspace/AllTests.php | 4 +- .../Zend/Service/Rackspace/Files/AllTests.php | 4 +- .../Service/Rackspace/Files/OfflineTest.php | 4 +- .../Service/Rackspace/Files/OnlineTest.php | 4 +- tests/Zend/Service/Rackspace/OfflineTest.php | 4 +- .../Service/Rackspace/Servers/AllTests.php | 4 +- .../Service/Rackspace/Servers/OfflineTest.php | 4 +- .../Service/Rackspace/Servers/OnlineTest.php | 4 +- tests/Zend/Service/ReCaptcha/AllTests.php | 4 +- tests/Zend/Service/ReCaptcha/MailHideTest.php | 4 +- .../Zend/Service/ReCaptcha/ReCaptchaTest.php | 4 +- tests/Zend/Service/ReCaptcha/ResponseTest.php | 4 +- tests/Zend/Service/ShortUrl/AllTests.php | 4 +- tests/Zend/Service/ShortUrl/BitLyTest.php | 4 +- tests/Zend/Service/ShortUrl/IsGdTest.php | 4 +- tests/Zend/Service/ShortUrl/JdemCzTest.php | 4 +- .../Zend/Service/ShortUrl/MetamarkNetTest.php | 4 +- .../Zend/Service/ShortUrl/TinyUrlComTest.php | 4 +- tests/Zend/Service/SlideShareTest.php | 4 +- tests/Zend/Service/SqlAzure/AllTests.php | 4 +- .../Service/SqlAzure/Management/AllTests.php | 4 +- .../Management/ManagementClientTest.php | 8 +-- tests/Zend/Service/StrikeIron/AllTests.php | 4 +- tests/Zend/Service/StrikeIron/BaseTest.php | 4 +- .../Zend/Service/StrikeIron/DecoratorTest.php | 2 +- .../Zend/Service/StrikeIron/ExceptionTest.php | 2 +- tests/Zend/Service/StrikeIron/NoSoapTest.php | 4 +- .../StrikeIron/SalesUseTaxBasicTest.php | 4 +- .../Service/StrikeIron/StrikeIronTest.php | 4 +- .../StrikeIron/USAddressVerificationTest.php | 4 +- .../Service/StrikeIron/ZipCodeInfoTest.php | 4 +- tests/Zend/Service/Twitter/AllTests.php | 4 +- tests/Zend/Service/Twitter/TwitterTest.php | 6 +- tests/Zend/Service/WindowsAzure/AllTests.php | 4 +- .../WindowsAzure/BlobSessionHandlerTest.php | 6 +- .../BlobStorageSharedAccessTest.php | 10 +-- .../Service/WindowsAzure/BlobStorageTest.php | 10 +-- .../Service/WindowsAzure/BlobStreamTest.php | 10 +-- .../WindowsAzure/Credentials/AllTests.php | 4 +- .../Credentials/SharedAccessSignatureTest.php | 6 +- .../Credentials/SharedKeyLiteTest.php | 6 +- .../Credentials/SharedKeyTest.php | 6 +- .../WindowsAzure/Diagnostics/AllTests.php | 4 +- .../WindowsAzure/Diagnostics/ManagerTest.php | 8 +-- .../WindowsAzure/DynamicTableEntityTest.php | 8 +-- .../WindowsAzure/Management/AllTests.php | 4 +- .../Management/ManagementClientTest.php | 10 +-- .../Service/WindowsAzure/QueueStorageTest.php | 10 +-- .../Service/WindowsAzure/RetryPolicyTest.php | 6 +- .../WindowsAzure/SessionHandlerTest.php | 6 +- .../Zend/Service/WindowsAzure/StorageTest.php | 6 +- .../WindowsAzure/TableEntityQueryTest.php | 6 +- .../Service/WindowsAzure/TableEntityTest.php | 6 +- .../WindowsAzure/TableSessionHandlerTest.php | 10 +-- .../Service/WindowsAzure/TableStorageTest.php | 10 +-- tests/Zend/Service/Yahoo/AllTests.php | 4 +- tests/Zend/Service/Yahoo/OfflineTest.php | 4 +- tests/Zend/Service/Yahoo/OnlineTest.php | 6 +- tests/Zend/Session/AllTests.php | 4 +- tests/Zend/Session/SaveHandler/AllTests.php | 4 +- .../Zend/Session/SaveHandler/DbTableTest.php | 6 +- tests/Zend/Session/SessionTest.php | 6 +- .../Session/Validator/NoticeValidator.php | 2 +- tests/Zend/Soap/AllTests.php | 4 +- tests/Zend/Soap/AutoDiscover/OnlineTest.php | 4 +- tests/Zend/Soap/AutoDiscoverTest.php | 4 +- tests/Zend/Soap/ClientTest.php | 8 +-- tests/Zend/Soap/ServerTest.php | 4 +- tests/Zend/Soap/Wsdl/AllTests.php | 2 +- .../Wsdl/ArrayOfTypeComplexStrategyTest.php | 4 +- .../Wsdl/ArrayOfTypeSequenceStrategyTest.php | 4 +- .../Zend/Soap/Wsdl/CompositeStrategyTest.php | 2 +- .../Zend/Soap/Wsdl/DefaultComplexTypeTest.php | 4 +- tests/Zend/Soap/WsdlTest.php | 2 +- tests/Zend/Stdlib/AllTests.php | 4 +- tests/Zend/Stdlib/CallbackHandlerTest.php | 8 +-- tests/Zend/Stdlib/PriorityQueueTest.php | 8 +-- tests/Zend/Stdlib/SplPriorityQueueTest.php | 8 +-- tests/Zend/Tag/AllTests.php | 4 +- tests/Zend/Tag/Cloud/AllTests.php | 4 +- tests/Zend/Tag/Cloud/CloudTest.php | 6 +- tests/Zend/Tag/Cloud/Decorator/AllTests.php | 4 +- .../Tag/Cloud/Decorator/HtmlCloudTest.php | 6 +- .../Zend/Tag/Cloud/Decorator/HtmlTagTest.php | 6 +- tests/Zend/Tag/ItemListTest.php | 6 +- tests/Zend/Tag/ItemTest.php | 6 +- tests/Zend/Test/AllTests.php | 4 +- tests/Zend/Test/DbAdapterTest.php | 4 +- tests/Zend/Test/DbStatementTest.php | 2 +- tests/Zend/Test/PHPUnit/AllTests.php | 4 +- .../Zend/Test/PHPUnit/Constraint/AllTests.php | 4 +- .../Test/PHPUnit/Constraint/DomQueryTest.php | 2 +- .../Test/PHPUnit/ControllerTestCaseTest.php | 12 ++-- tests/Zend/Test/PHPUnit/Db/AllTests.php | 4 +- tests/Zend/Test/PHPUnit/Db/ConnectionTest.php | 4 +- .../Zend/Test/PHPUnit/Db/DataSet/AllTests.php | 4 +- .../PHPUnit/Db/DataSet/DataSetTestCase.php | 4 +- .../Test/PHPUnit/Db/DataSet/DbRowsetTest.php | 2 +- .../PHPUnit/Db/DataSet/DbTableDataSetTest.php | 2 +- .../Test/PHPUnit/Db/DataSet/DbTableTest.php | 2 +- .../Db/Integration/AbstractTestCase.php | 2 +- .../Db/Integration/MysqlIntegrationTest.php | 2 +- .../Db/Integration/SqLiteIntegrationTest.php | 2 +- .../Test/PHPUnit/Db/Metadata/GenericTest.php | 4 +- .../Test/PHPUnit/Db/Operation/AllTests.php | 4 +- .../PHPUnit/Db/Operation/DeleteAllTest.php | 4 +- .../Test/PHPUnit/Db/Operation/InsertTest.php | 4 +- .../PHPUnit/Db/Operation/TruncateTest.php | 4 +- .../Zend/Test/PHPUnit/Db/SimpleTesterTest.php | 2 +- tests/Zend/Text/AllTests.php | 4 +- tests/Zend/Text/FigletTest.php | 6 +- tests/Zend/Text/MultiByteTest.php | 6 +- tests/Zend/Text/TableTest.php | 8 +-- tests/Zend/TimeSyncTest.php | 2 +- tests/Zend/Tool/AllTests.php | 4 +- tests/Zend/Tool/Framework/Action/BaseTest.php | 2 +- .../Tool/Framework/Action/RepositoryTest.php | 6 +- tests/Zend/Tool/Framework/AllTests.php | 4 +- .../Tool/Framework/Client/RequestTest.php | 4 +- .../Tool/Framework/Client/ResponseTest.php | 4 +- .../Loader/IncludePathLoaderTest.php | 6 +- .../Manifest/ProviderMetadataTest.php | 6 +- .../Framework/Manifest/RepositoryTest.php | 6 +- .../Framework/Metadata/ActionMetadataTest.php | 6 +- .../Tool/Framework/Metadata/MetadataTest.php | 6 +- .../Tool/Framework/Provider/AbstractTest.php | 4 +- .../Framework/Provider/RepositoryTest.php | 6 +- .../Tool/Framework/Provider/SignatureTest.php | 6 +- tests/Zend/Tool/Framework/RegistryTest.php | 6 +- tests/Zend/Tool/Project/AllTests.php | 4 +- .../Tool/Project/Context/RegistryTest.php | 4 +- tests/Zend/Tool/Project/ProfileTest.php | 6 +- .../Tool/Project/Provider/ControllerTest.php | 2 +- tests/Zend/Translate/Adapter/AllTests.php | 4 +- tests/Zend/Translate/Adapter/ArrayTest.php | 10 +-- tests/Zend/Translate/Adapter/CsvTest.php | 8 +-- tests/Zend/Translate/Adapter/GettextTest.php | 8 +-- tests/Zend/Translate/Adapter/IniTest.php | 6 +- tests/Zend/Translate/Adapter/QtTest.php | 6 +- tests/Zend/Translate/Adapter/TbxTest.php | 6 +- tests/Zend/Translate/Adapter/TmxTest.php | 6 +- tests/Zend/Translate/Adapter/XliffTest.php | 6 +- tests/Zend/Translate/Adapter/XmlTmTest.php | 6 +- tests/Zend/Translate/AllTests.php | 4 +- tests/Zend/TranslateTest.php | 8 +-- tests/Zend/Uri/AllTests.php | 4 +- tests/Zend/Uri/HttpTest.php | 4 +- tests/Zend/UriTest.php | 10 +-- tests/Zend/Validate/AbstractTest.php | 10 +-- tests/Zend/Validate/AllTests.php | 4 +- tests/Zend/Validate/AlnumTest.php | 4 +- tests/Zend/Validate/AlphaTest.php | 4 +- tests/Zend/Validate/BarcodeTest.php | 2 +- tests/Zend/Validate/BetweenTest.php | 2 +- tests/Zend/Validate/CallbackTest.php | 6 +- tests/Zend/Validate/CcnumTest.php | 6 +- tests/Zend/Validate/CreditCardTest.php | 3 +- tests/Zend/Validate/DateTest.php | 4 +- tests/Zend/Validate/Db/AllTests.php | 4 +- tests/Zend/Validate/Db/NoRecordExistsTest.php | 4 +- tests/Zend/Validate/Db/RecordExistsTest.php | 4 +- tests/Zend/Validate/DigitsTest.php | 4 +- tests/Zend/Validate/EmailAddressTest.php | 8 +-- tests/Zend/Validate/File/AllTests.php | 4 +- tests/Zend/Validate/File/CountTest.php | 6 +- tests/Zend/Validate/File/Crc32Test.php | 6 +- .../Validate/File/ExcludeExtensionTest.php | 6 +- .../Validate/File/ExcludeMimeTypeTest.php | 6 +- tests/Zend/Validate/File/ExistsTest.php | 6 +- tests/Zend/Validate/File/ExtensionTest.php | 6 +- tests/Zend/Validate/File/FilesSizeTest.php | 8 +-- tests/Zend/Validate/File/HashTest.php | 6 +- tests/Zend/Validate/File/ImageSizeTest.php | 4 +- tests/Zend/Validate/File/IsCompressedTest.php | 6 +- tests/Zend/Validate/File/IsImageTest.php | 6 +- tests/Zend/Validate/File/Md5Test.php | 6 +- tests/Zend/Validate/File/MimeTypeTest.php | 12 ++-- tests/Zend/Validate/File/NotExistsTest.php | 6 +- tests/Zend/Validate/File/Sha1Test.php | 6 +- tests/Zend/Validate/File/SizeTest.php | 6 +- tests/Zend/Validate/File/UploadTest.php | 6 +- tests/Zend/Validate/File/WordCountTest.php | 6 +- tests/Zend/Validate/FloatTest.php | 6 +- tests/Zend/Validate/GreaterThanTest.php | 2 +- tests/Zend/Validate/HexTest.php | 4 +- tests/Zend/Validate/HostnameTest.php | 6 +- tests/Zend/Validate/IbanTest.php | 2 +- tests/Zend/Validate/IdenticalTest.php | 8 +-- tests/Zend/Validate/InArrayTest.php | 2 +- tests/Zend/Validate/IntTest.php | 4 +- tests/Zend/Validate/IpTest.php | 4 +- tests/Zend/Validate/IsbnTest.php | 2 +- tests/Zend/Validate/LessThanTest.php | 2 +- tests/Zend/Validate/MessageTest.php | 8 +-- tests/Zend/Validate/NotEmptyTest.php | 8 +-- tests/Zend/Validate/PostCodeTest.php | 8 +-- tests/Zend/Validate/RegexTest.php | 2 +- tests/Zend/Validate/Sitemap/AllTests.php | 4 +- .../Zend/Validate/Sitemap/ChangefreqTest.php | 6 +- tests/Zend/Validate/Sitemap/LastmodTest.php | 6 +- tests/Zend/Validate/Sitemap/LocTest.php | 6 +- tests/Zend/Validate/Sitemap/PriorityTest.php | 6 +- tests/Zend/Validate/StringLengthTest.php | 4 +- tests/Zend/ValidateTest.php | 6 +- tests/Zend/VersionTest.php | 6 +- tests/Zend/View/AllTests.php | 4 +- tests/Zend/View/Helper/ActionTest.php | 10 +-- tests/Zend/View/Helper/AllTests.php | 4 +- .../View/Helper/AttributeJsEscapingTest.php | 10 +-- tests/Zend/View/Helper/BaseUrlTest.php | 10 +-- tests/Zend/View/Helper/CurrencyTest.php | 10 +-- tests/Zend/View/Helper/CycleTest.php | 10 +-- tests/Zend/View/Helper/DeclareVarsTest.php | 10 +-- tests/Zend/View/Helper/DoctypeTest.php | 10 +-- tests/Zend/View/Helper/FieldsetTest.php | 10 +-- tests/Zend/View/Helper/FormButtonTest.php | 10 +-- tests/Zend/View/Helper/FormCheckboxTest.php | 8 +-- tests/Zend/View/Helper/FormErrorsTest.php | 10 +-- tests/Zend/View/Helper/FormFileTest.php | 8 +-- tests/Zend/View/Helper/FormImageTest.php | 10 +-- tests/Zend/View/Helper/FormLabelTest.php | 10 +-- .../View/Helper/FormMultiCheckboxTest.php | 10 +-- tests/Zend/View/Helper/FormPasswordTest.php | 8 +-- tests/Zend/View/Helper/FormRadioTest.php | 8 +-- tests/Zend/View/Helper/FormResetTest.php | 10 +-- tests/Zend/View/Helper/FormSelectTest.php | 10 +-- tests/Zend/View/Helper/FormSubmitTest.php | 10 +-- tests/Zend/View/Helper/FormTest.php | 10 +-- tests/Zend/View/Helper/FormTextTest.php | 8 +-- tests/Zend/View/Helper/FormTextareaTest.php | 8 +-- tests/Zend/View/Helper/GravatarTest.php | 10 +-- tests/Zend/View/Helper/HeadLinkTest.php | 22 +++---- tests/Zend/View/Helper/HeadMetaTest.php | 36 +++++------ tests/Zend/View/Helper/HeadScriptTest.php | 16 ++--- tests/Zend/View/Helper/HeadStyleTest.php | 24 +++---- tests/Zend/View/Helper/HeadTitleTest.php | 10 +-- tests/Zend/View/Helper/HtmlFlashTest.php | 10 +-- tests/Zend/View/Helper/HtmlListTest.php | 10 +-- tests/Zend/View/Helper/HtmlObjectTest.php | 10 +-- tests/Zend/View/Helper/HtmlPageTest.php | 10 +-- tests/Zend/View/Helper/HtmlQuicktimeTest.php | 10 +-- tests/Zend/View/Helper/InlineScriptTest.php | 10 +-- tests/Zend/View/Helper/JsonTest.php | 10 +-- tests/Zend/View/Helper/LayoutTest.php | 10 +-- .../Zend/View/Helper/Navigation/AllTests.php | 4 +- .../Zend/View/Helper/Navigation/LinksTest.php | 6 +- .../View/Helper/Navigation/SitemapTest.php | 6 +- .../View/Helper/Navigation/TestAbstract.php | 6 +- .../View/Helper/PaginationControlTest.php | 10 +-- tests/Zend/View/Helper/PartialLoopTest.php | 10 +-- tests/Zend/View/Helper/PartialTest.php | 10 +-- .../View/Helper/Placeholder/ContainerTest.php | 10 +-- .../View/Helper/Placeholder/RegistryTest.php | 10 +-- .../Placeholder/StandaloneContainerTest.php | 10 +-- tests/Zend/View/Helper/PlaceholderTest.php | 10 +-- .../View/Helper/RenderToPlaceholderTest.php | 4 +- tests/Zend/View/Helper/ServerUrlTest.php | 6 +- tests/Zend/View/Helper/TranslateTest.php | 10 +-- tests/Zend/View/Helper/UrlTest.php | 8 +-- tests/Zend/View/Helper/UserAgentTest.php | 8 +-- tests/Zend/ViewTest.php | 10 +-- tests/Zend/Wildfire/AllTests.php | 4 +- tests/Zend/Wildfire/WildfireTest.php | 10 +-- tests/Zend/Xml/AllTests.php | 4 +- tests/Zend/Xml/MultibyteTest.php | 6 +- tests/Zend/Xml/SecurityTest.php | 6 +- tests/Zend/XmlRpc/AllTests.php | 4 +- tests/Zend/XmlRpc/BigIntegerValueTest.php | 6 +- tests/Zend/XmlRpc/ClientTest.php | 6 +- tests/Zend/XmlRpc/FaultTest.php | 6 +- tests/Zend/XmlRpc/GeneratorTest.php | 2 +- tests/Zend/XmlRpc/Request/HttpTest.php | 10 +-- tests/Zend/XmlRpc/RequestTest.php | 6 +- tests/Zend/XmlRpc/ResponseTest.php | 6 +- tests/Zend/XmlRpc/Server/CacheTest.php | 10 +-- tests/Zend/XmlRpc/Server/FaultTest.php | 6 +- tests/Zend/XmlRpc/ServerTest.php | 8 +-- tests/Zend/XmlRpc/ValueTest.php | 4 +- tests/openssl.conf | 17 +++++ tests/phpunit.xml | 3 +- tests/resources/AllTests.php | 4 +- tests/resources/Runner.php | 22 +++++++ tests/resources/languages/AllTests.php | 4 +- .../resources/languages/Zend_ValidateTest.php | 4 +- 1265 files changed, 3792 insertions(+), 3659 deletions(-) create mode 100644 tests/openssl.conf create mode 100644 tests/resources/Runner.php diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index ce8b2395ec..6cdce10d19 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -1,4 +1,4 @@ -name: PHPUnit-9 +name: PHPUnit on: [push, pull_request] @@ -9,7 +9,6 @@ jobs: runs-on: ubuntu-22.04 env: - PHP_EXTENSIONS: none, posix, curl, dom, json, libxml, mbstring, openssl, tokenizer, xml, xmlwriter, ctype, iconv, simplexml, pdo_sqlite, pdo_mysql, fileinfo, json, zip, sqlite, soap, bcmath, mcrypt, igbinary, gd, bz2, lzf, rar, memcached, memcache PHP_INI_VALUES: memory_limit=-1, assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED: true @@ -34,7 +33,7 @@ jobs: TESTS_ZEND_CACHE_LIBMEMCACHED_HOST: 127.0.0.1 TESTS_ZEND_CACHE_LIBMEMCACHED_PORT: 11211 - # https://hub.docker.com/r/bitnami/openldap + # https://hub.docker.com/r/bitnami/openldap LDAP_ROOT: "dc=example,dc=com" LDAP_ALLOW_ANON_BINDING: false LDAP_SKIP_DEFAULT_TREE: "yes" @@ -46,6 +45,7 @@ jobs: TESTS_ZEND_AUTH_ADAPTER_LDAP_ONLINE_ENABLED: true LOCALES: "fr_FR@euro fr_FR fr_BE.UTF-8 de en_US" + OPENSSL_CONF: "./tests/openssl.conf" services: memcache: image: memcached:1.6.17-alpine @@ -60,7 +60,7 @@ jobs: MYSQL_DATABASE: ${{ env.TESTS_ZEND_DB_ADAPTER_MYSQL_DATABASE }} MYSQL_AUTHENTICATION_PLUGIN: mysql_native_password ports: - - 3306:3306 + - 3306:3306 options: >- --health-cmd "mysqladmin ping" --health-interval 10s @@ -99,13 +99,28 @@ jobs: fail-fast: false matrix: php-version: + - "7.1" + - "7.2" + - "7.3" + - "7.4" - "8.0" - "8.1" - "8.2" experimental: - false include: + #bare for PHP >=7.2 + - php-extensions-bare: "none, iconv, json, libxml, xml, dom, simplexml, xmlwriter, tokenizer, mbstring" + #full for PHP <= 8.0 + - php-extensions-full: "none, iconv, json, libxml, xml, dom, simplexml, xmlwriter, tokenizer, mbstring, ctype, openssl, curl, gd, posix, pdo_sqlite, pdo_mysql, fileinfo, zip, sqlite, soap, bcmath, igbinary, bz2, lzf, memcached, memcache, ldap, sqlite, mcrypt, rar" + - php-version: "7.1" + php-extensions-bare: "none, iconv, json, libxml, xml, dom, simplexml, xmlwriter, tokenizer" + - php-version: "8.1" + php-extensions-full: "none, iconv, json, libxml, xml, dom, simplexml, xmlwriter, tokenizer, mbstring, ctype, openssl, curl, gd, posix, pdo_sqlite, pdo_mysql, fileinfo, zip, sqlite, soap, bcmath, igbinary, bz2, lzf, memcached, memcache, ldap, sqlite, mcrypt" + - php-version: "8.2" + php-extensions-full: "none, iconv, json, libxml, xml, dom, simplexml, xmlwriter, tokenizer, mbstring, ctype, openssl, curl, gd, posix, pdo_sqlite, pdo_mysql, fileinfo, zip, sqlite, soap, bcmath, igbinary, bz2, lzf, memcached, memcache, ldap, sqlite, mcrypt" - php-version: "8.3" + php-extensions-full: "none, iconv, json, libxml, xml, dom, simplexml, xmlwriter, tokenizer, mbstring, ctype, openssl, curl, gd, posix, pdo_sqlite, pdo_mysql, fileinfo, zip, sqlite, soap, bcmath, igbinary, bz2, lzf, memcached, memcache, ldap, sqlite" experimental: true steps: @@ -118,20 +133,31 @@ jobs: echo "All languages..." locale -a - - name: Provider config base on env for intergrate test + - name: Provider config base on env for integrate test run: cp tests/TestConfiguration.env.php tests/TestConfiguration.php - - name: Install PHP with extensions + - name: Install PHP with minimal extensions uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} tools: cs2pr - extensions: memcached, memcache + extensions: ${{ matrix.php-extensions-bare }} ini-values: ${{ env.PHP_INI_VALUES }} env: # https://github.com/shivammathur/setup-php/issues/407#issuecomment-773675741 fail-fast: true + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer- + - name: Install dependencies run: composer install --prefer-dist --no-progress --no-suggest @@ -139,11 +165,28 @@ jobs: run: | bin/parallel-lint --exclude vendor --exclude tests/Zend/Loader/_files/ParseError.php . --checkstyle | cs2pr + - name: "Run tests on PHP ${{ matrix.php-version }} (Experimental: ${{ matrix.experimental }}) with minimal extensions" + run: | + bin/phpunit -c tests/phpunit.xml + continue-on-error: ${{ matrix.experimental }} + - name: Setup LDAP run: | sudo apt-get install -y libnss-ldap libpam-ldap ldap-utils tests/resources/openldap/docker-entrypoint-initdb.d/init.sh - - name: "Run tests on PHP ${{ matrix.php-version }} (Experimental: ${{ matrix.experimental }})" - run: bin/phpunit -c tests/phpunit.xml - continue-on-error: ${{ matrix.experimental }} \ No newline at end of file + - name: Install PHP with extensions + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + tools: cs2pr + extensions: ${{ matrix.php-extensions-full }} + ini-values: ${{ env.PHP_INI_VALUES }} + env: + # https://github.com/shivammathur/setup-php/issues/407#issuecomment-773675741 + fail-fast: true + + - name: "Run tests on PHP ${{ matrix.php-version }} (Experimental: ${{ matrix.experimental }}) with extensions" + run: | + bin/phpunit -c tests/phpunit.xml + continue-on-error: ${{ matrix.experimental }} diff --git a/composer.json b/composer.json index 0d2daabaef..a4262cb47b 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ "require": { "php": ">=7.1", "symfony/polyfill-php81": "^1.24", + "symfony/polyfill-ctype": "^1.27", "symfony/polyfill-mbstring": "^1.26" }, "suggest": { @@ -33,9 +34,10 @@ } }, "require-dev": { - "phpunit/phpunit": "^9", + "phpunit/phpunit": "^7|^8|^9", "php-parallel-lint/php-parallel-lint": "^1.3", - "rector/rector": "^0.14.8" + "rector/rector": "^0.12.19", + "yoast/phpunit-polyfills": "2.0" }, "archive": { "exclude": ["/demos", "/documentation", "/tests"] diff --git a/library/Zend/Filter/Encrypt/Openssl.php b/library/Zend/Filter/Encrypt/Openssl.php index 4facd37cd0..a438c6c489 100644 --- a/library/Zend/Filter/Encrypt/Openssl.php +++ b/library/Zend/Filter/Encrypt/Openssl.php @@ -128,7 +128,8 @@ protected function _setKeys($keys) } foreach ($keys as $type => $key) { - if (ctype_print($key) && is_file(realpath($key)) && is_readable($key)) { + $key = (string)$key; + if (ctype_print($key) && is_file($key) && is_readable($key)) { $file = fopen($key, 'r'); $cert = fread($file, 8192); fclose($file); @@ -354,7 +355,7 @@ public function setPackage($package) */ public function encrypt($value) { - $encrypted = []; + $encrypted = ''; $encryptedkeys = []; if (count($this->_keys['public']) === 0) { @@ -385,7 +386,7 @@ public function encrypt($value) $value = $compress->filter($value); } - $crypt = openssl_seal($value, $encrypted, $encryptedkeys, $keys); + $crypt = openssl_seal($value, $encrypted, $encryptedkeys, $keys, 'RC4'); if (PHP_VERSION_ID < 80000) { foreach ($keys as $key) { openssl_free_key($key); @@ -465,7 +466,7 @@ public function decrypt($value) $value = substr($value, $length); } - $crypt = openssl_open($value, $decrypted, $envelope, $keys); + $crypt = openssl_open($value, $decrypted, $envelope, $keys, 'RC4'); if (PHP_VERSION_ID < 80000) { openssl_free_key($keys); } diff --git a/library/Zend/Json/Decoder.php b/library/Zend/Json/Decoder.php index adc8fcba0e..5a05d38b71 100644 --- a/library/Zend/Json/Decoder.php +++ b/library/Zend/Json/Decoder.php @@ -558,7 +558,7 @@ protected static function _utf162utf8($utf16) { // Check for mb extension otherwise do by hand. if( function_exists('mb_convert_encoding') ) { - return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16'); + return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16BE'); } $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]); diff --git a/library/Zend/Json/Encoder.php b/library/Zend/Json/Encoder.php index c144eb8a49..69b9f3dcf3 100644 --- a/library/Zend/Json/Encoder.php +++ b/library/Zend/Json/Encoder.php @@ -546,7 +546,7 @@ protected static function _utf82utf16($utf8) { // Check for mb extension otherwise do by hand. if( function_exists('mb_convert_encoding') ) { - return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8'); + return mb_convert_encoding($utf8, 'UTF-16BE', 'UTF-8'); } switch (strlen($utf8)) { @@ -575,4 +575,3 @@ protected static function _utf82utf16($utf8) return ''; } } - diff --git a/tests/AllTests.php b/tests/AllTests.php index e32d85b849..35520bb30f 100644 --- a/tests/AllTests.php +++ b/tests/AllTests.php @@ -69,7 +69,7 @@ public static function main() // ob_end_flush(); // } - (new TestRunner())->run(self::suite(), $parameters); + (new resources_Runner())->run(self::suite(), $parameters); } /** @@ -107,6 +107,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'AllTests::main') { AllTests::main(); } diff --git a/tests/TestHelper.php b/tests/TestHelper.php index 2d117491e2..5162436746 100644 --- a/tests/TestHelper.php +++ b/tests/TestHelper.php @@ -30,7 +30,7 @@ require_once 'PHPUnit/Runner/Version.php'; $phpunitVersion = Version::id(); - if ($phpunitVersion == '@package_version@' || version_compare($phpunitVersion, '3.5.5', '>=')) { + if ($phpunitVersion === '@package_version@' || version_compare($phpunitVersion, '3.5.5', '>=')) { require_once 'PHPUnit/Autoload.php'; // >= PHPUnit 3.5.5 } else { require_once 'PHPUnit/Framework.php'; // < PHPUnit 3.5.5 diff --git a/tests/Zend/Acl/AclTest.php b/tests/Zend/Acl/AclTest.php index a22d2803b0..8d4dc7d0c2 100644 --- a/tests/Zend/Acl/AclTest.php +++ b/tests/Zend/Acl/AclTest.php @@ -1,6 +1,6 @@ _acl = new Zend_Acl(); } @@ -1271,7 +1271,7 @@ public function testAclPassesPrivilegeToAssertClass() */ public function testGetRegisteredRolesIsDeprecated() { - $this->expectNotice(); + $this->expectException(\PHPUnit\Framework\Error\Notice::class); $this->_acl->getRegisteredRoles(); } diff --git a/tests/Zend/Acl/AllTests.php b/tests/Zend/Acl/AllTests.php index 309f640240..65efad590a 100644 --- a/tests/Zend/Acl/AllTests.php +++ b/tests/Zend/Acl/AllTests.php @@ -42,7 +42,7 @@ class Zend_Acl_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Acl_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Acl_AllTests::main') { Zend_Acl_AllTests::main(); } diff --git a/tests/Zend/AllTests.php b/tests/Zend/AllTests.php index 0494da2259..1b882040a9 100644 --- a/tests/Zend/AllTests.php +++ b/tests/Zend/AllTests.php @@ -140,7 +140,7 @@ public static function main() // ob_end_flush(); // } - (new TestRunner())->run(self::suite(), $arguments); + (new resources_Runner())->run(self::suite(), $arguments); } /** @@ -263,6 +263,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_AllTests::main') { Zend_AllTests::main(); } diff --git a/tests/Zend/AllTests/StreamWrapper/PhpInput.php b/tests/Zend/AllTests/StreamWrapper/PhpInput.php index 05d87f7623..900e3a493e 100644 --- a/tests/Zend/AllTests/StreamWrapper/PhpInput.php +++ b/tests/Zend/AllTests/StreamWrapper/PhpInput.php @@ -26,7 +26,7 @@ * * class ... * { - * public function setUp() + * public function set_up() * { * Zend_AllTests_StreamWrapper_PhpInput::mockInput('expected string'); * } @@ -37,7 +37,7 @@ * $this->assertSame('php://input', Zend_AllTests_StreamWrapper_PhpInput::getCurrentPath()); * } * - * public function tearDown() + * public function tear_down() * { * Zend_AllTests_StreamWrapper_PhpInput::restoreDefault(); * } diff --git a/tests/Zend/Amf/Adobe/IntrospectorTest.php b/tests/Zend/Amf/Adobe/IntrospectorTest.php index 48b21cccab..65add10565 100644 --- a/tests/Zend/Amf/Adobe/IntrospectorTest.php +++ b/tests/Zend/Amf/Adobe/IntrospectorTest.php @@ -1,6 +1,6 @@ run($suite); + (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->introspector = new Zend_Amf_Adobe_Introspector(); } @@ -235,6 +235,6 @@ class com_zend_framework_IntrospectorTestExplicitType // Call Zend_Amf_Adobe_IntrospectorTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Amf_Adobe_IntrospectorTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Amf_Adobe_IntrospectorTest::main") { Zend_Amf_Adobe_IntrospectorTest::main(); } diff --git a/tests/Zend/Amf/AllTests.php b/tests/Zend/Amf/AllTests.php index 3298a03216..a6106bdc26 100644 --- a/tests/Zend/Amf/AllTests.php +++ b/tests/Zend/Amf/AllTests.php @@ -52,7 +52,7 @@ class Zend_Amf_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -76,6 +76,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Amf_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Amf_AllTests::main') { Zend_Amf_AllTests::main(); } diff --git a/tests/Zend/Amf/AuthTest.php b/tests/Zend/Amf/AuthTest.php index e49a2a0836..7f0a6ddc93 100755 --- a/tests/Zend/Amf/AuthTest.php +++ b/tests/Zend/Amf/AuthTest.php @@ -1,6 +1,6 @@ run($suite); + (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_server = new Zend_Amf_Server(); $this->_server->setProduction(false); @@ -76,7 +76,7 @@ protected function setUp(): void $this->_acl = new Zend_Acl(); } - protected function tearDown(): void + protected function tear_down() { unset($this->_server); } @@ -275,7 +275,7 @@ public function testLogout() $this->assertStringContainsString("hello", $resp[1]->getData()); // After logout same request should not be allowed - $this->setUp(); + $this->set_up(); $this->_server->setAuth(new RightPassword("testuser", "testrole")); $this->_server->setAcl($this->_acl); $request = new Zend_Amf_Request(); @@ -369,6 +369,6 @@ public function initAcl() } } -if (PHPUnit_MAIN_METHOD == "Zend_Amf_AuthTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Amf_AuthTest::main") { Zend_Amf_AuthTest::main(); } diff --git a/tests/Zend/Amf/RequestTest.php b/tests/Zend/Amf/RequestTest.php index 1e39208471..3f73105445 100644 --- a/tests/Zend/Amf/RequestTest.php +++ b/tests/Zend/Amf/RequestTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** * Setup environment */ - protected function setUp(): void + protected function set_up() { date_default_timezone_set("America/Chicago"); Zend_Locale::setDefault('en'); @@ -78,7 +78,7 @@ protected function setUp(): void /** * Teardown environment */ - protected function tearDown(): void + protected function tear_down() { unset($this->_request); } @@ -667,6 +667,6 @@ public function testAmf0CredentialsInHeader() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Amf_RequestTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Amf_RequestTest::main') { Zend_Amf_RequestTest::main(); } diff --git a/tests/Zend/Amf/ResourceTest.php b/tests/Zend/Amf/ResourceTest.php index 0532911d29..e3950296bc 100755 --- a/tests/Zend/Amf/ResourceTest.php +++ b/tests/Zend/Amf/ResourceTest.php @@ -1,6 +1,6 @@ run($suite); + (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_server = new Zend_Amf_Server(); $this->_server->setProduction(false); Zend_Amf_Parse_TypeLoader::resetMap(); } - protected function tearDown(): void + protected function tear_down() { unset($this->_server); } @@ -205,6 +205,6 @@ public function load($name) } } -if (PHPUnit_MAIN_METHOD == "Zend_Amf_ResourceTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Amf_ResourceTest::main") { Zend_Amf_ResourceTest::main(); } diff --git a/tests/Zend/Amf/Response/HttpTest.php b/tests/Zend/Amf/Response/HttpTest.php index 037e994721..f2b5c85d10 100644 --- a/tests/Zend/Amf/Response/HttpTest.php +++ b/tests/Zend/Amf/Response/HttpTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -83,6 +83,6 @@ public function isIeOverSsl() } -if (PHPUnit_MAIN_METHOD == 'Zend_Amf_Response_HttpTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Amf_Response_HttpTest::main') { Zend_Amf_Response_HttpTest::main(); } diff --git a/tests/Zend/Amf/ResponseTest.php b/tests/Zend/Amf/ResponseTest.php index 00f8f73cf5..50f9496f6f 100644 --- a/tests/Zend/Amf/ResponseTest.php +++ b/tests/Zend/Amf/ResponseTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** * Setup environment */ - protected function setUp(): void + protected function set_up() { date_default_timezone_set('America/Chicago'); Zend_Locale::setDefault('en_US'); @@ -95,7 +95,7 @@ protected function setUp(): void /** * Teardown environment */ - protected function tearDown(): void + protected function tear_down() { unset($this->_response); } @@ -1074,6 +1074,6 @@ class TestObject public $recursive; } -if (PHPUnit_MAIN_METHOD == 'Zend_Amf_ResponseTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Amf_ResponseTest::main') { Zend_Amf_ResponseTest::main(); } diff --git a/tests/Zend/Amf/ServerTest.php b/tests/Zend/Amf/ServerTest.php index 08d1d9ff64..01bd3debe7 100644 --- a/tests/Zend/Amf/ServerTest.php +++ b/tests/Zend/Amf/ServerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_server = new Zend_Amf_Server(); $this->_server->setProduction(false); Zend_Amf_Parse_TypeLoader::resetMap(); } - protected function tearDown(): void + protected function tear_down() { unset($this->_server); //Zend_Amf_Parse_TypeLoader::resetMap(); @@ -1165,7 +1165,7 @@ public function testServerShouldCastObjectArgumentsToAppropriateType() } } -if (PHPUnit_MAIN_METHOD == "Zend_Amf_ServerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Amf_ServerTest::main") { Zend_Amf_ServerTest::main(); } diff --git a/tests/Zend/Amf/TypeLoaderTest.php b/tests/Zend/Amf/TypeLoaderTest.php index 2ed6171fa8..6031c835a6 100644 --- a/tests/Zend/Amf/TypeLoaderTest.php +++ b/tests/Zend/Amf/TypeLoaderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -95,6 +95,6 @@ public function testUnknownClassMap() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Amf_TypeloaderTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Amf_TypeloaderTest::main') { Zend_Amf_ResponseTest::main(); } diff --git a/tests/Zend/Amf/Util/BinaryStreamTest.php b/tests/Zend/Amf/Util/BinaryStreamTest.php index dbb2f0a5d1..a3d41e265a 100644 --- a/tests/Zend/Amf/Util/BinaryStreamTest.php +++ b/tests/Zend/Amf/Util/BinaryStreamTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testConstructorShouldThrowExceptionForInvalidStream() @@ -89,6 +89,6 @@ public function testBinaryStreamsShouldAllowWritingUtf8() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Amf_Util_BinaryStreamTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Amf_Util_BinaryStreamTest::main') { Zend_Amf_Util_BinaryStreamTest::main(); } diff --git a/tests/Zend/Amf/Value/ArrayCollectionTest.php b/tests/Zend/Amf/Value/ArrayCollectionTest.php index 8c3df76089..caa291fa24 100644 --- a/tests/Zend/Amf/Value/ArrayCollectionTest.php +++ b/tests/Zend/Amf/Value/ArrayCollectionTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $data = []; $data[] = ['foo' => 'foo1', 'bar' => 'bar1']; @@ -71,7 +71,7 @@ protected function setUp(): void $this->_data = $data; } - protected function tearDown(): void + protected function tear_down() { unset($this->_arrayCollection); unset($this->_data); @@ -213,6 +213,6 @@ public function __toString() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Amf_Value_ArrayCollectionTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Amf_Value_ArrayCollectionTest::main') { Zend_Amf_Value_ArrayCollectionTest::main(); } diff --git a/tests/Zend/Amf/Value/MessageBodyTest.php b/tests/Zend/Amf/Value/MessageBodyTest.php index a64a26e061..be19205be7 100644 --- a/tests/Zend/Amf/Value/MessageBodyTest.php +++ b/tests/Zend/Amf/Value/MessageBodyTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->body = new Zend_Amf_Value_MessageBody('/foo', '/bar', 'data'); } @@ -105,6 +105,6 @@ public function __toString() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Amf_Value_MessageBodyTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Amf_Value_MessageBodyTest::main') { Zend_Amf_Value_MessageBodyTest::main(); } diff --git a/tests/Zend/Amf/Value/MessageHeaderTest.php b/tests/Zend/Amf/Value/MessageHeaderTest.php index 2b30d2365a..c93508c57a 100644 --- a/tests/Zend/Amf/Value/MessageHeaderTest.php +++ b/tests/Zend/Amf/Value/MessageHeaderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testConstructorShouldSetMessageHeaderName() @@ -98,6 +98,6 @@ public function testConstructorShouldCastLengthToInteger() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Amf_Value_MessageHeaderTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Amf_Value_MessageHeaderTest::main') { Zend_Amf_Value_MessageHeaderTest::main(); } diff --git a/tests/Zend/Application/AllTests.php b/tests/Zend/Application/AllTests.php index 84a0de2fff..e6c3e509f2 100644 --- a/tests/Zend/Application/AllTests.php +++ b/tests/Zend/Application/AllTests.php @@ -46,7 +46,7 @@ class Zend_Application_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -63,6 +63,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_AllTests::main') { Zend_Application_AllTests::main(); } diff --git a/tests/Zend/Application/ApplicationTest.php b/tests/Zend/Application/ApplicationTest.php index d8a28e9a73..8d94c33f5b 100644 --- a/tests/Zend/Application/ApplicationTest.php +++ b/tests/Zend/Application/ApplicationTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -98,7 +98,7 @@ protected function setUp(): void $this->iniOptions = []; } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -565,6 +565,6 @@ public function testOptionsCanHandleMuiltipleConigFiles() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_ApplicationTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_ApplicationTest::main') { Zend_Application_ApplicationTest::main(); } diff --git a/tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php b/tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php index 94df93ff86..f5d4522705 100644 --- a/tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php +++ b/tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -109,7 +109,7 @@ protected function setUp(): void $this->error = false; } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -844,6 +844,6 @@ public function getOptionKeys() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Bootstrap_BootstrapAbstractTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Bootstrap_BootstrapAbstractTest::main') { Zend_Application_Bootstrap_BootstrapAbstractTest::main(); } diff --git a/tests/Zend/Application/Bootstrap/BootstrapTest.php b/tests/Zend/Application/Bootstrap/BootstrapTest.php index 39e9254b13..6525c8586d 100644 --- a/tests/Zend/Application/Bootstrap/BootstrapTest.php +++ b/tests/Zend/Application/Bootstrap/BootstrapTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -91,7 +91,7 @@ protected function setUp(): void $this->resetFrontController(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -233,6 +233,6 @@ public function testBootstrapRunMethodShouldReturnResponseIfFlagEnabled() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Bootstrap_BootstrapTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Bootstrap_BootstrapTest::main') { Zend_Application_Bootstrap_BootstrapTest::main(); } diff --git a/tests/Zend/Application/Module/AutoloaderTest.php b/tests/Zend/Application/Module/AutoloaderTest.php index 97fd4b2092..5143a8300f 100644 --- a/tests/Zend/Application/Module/AutoloaderTest.php +++ b/tests/Zend/Application/Module/AutoloaderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -115,7 +115,7 @@ protected function setUp(): void ]); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -217,6 +217,6 @@ public function testDefaultResourceShouldBeModel() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Module_AutoloaderTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Module_AutoloaderTest::main') { Zend_Application_Module_AutoloaderTest::main(); } diff --git a/tests/Zend/Application/Module/BootstrapTest.php b/tests/Zend/Application/Module/BootstrapTest.php index 3b93fa1161..ecc0b8c917 100644 --- a/tests/Zend/Application/Module/BootstrapTest.php +++ b/tests/Zend/Application/Module/BootstrapTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -83,7 +83,7 @@ protected function setUp(): void Zend_Controller_Front::getInstance()->resetInstance(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -252,6 +252,6 @@ public function testModuleBootstrapShouldInheritApplicationBootstrapPluginPaths( } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Module_BootstrapTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Module_BootstrapTest::main') { Zend_Application_Module_BootstrapTest::main(); } diff --git a/tests/Zend/Application/Resource/AllTests.php b/tests/Zend/Application/Resource/AllTests.php index 23464b05e7..3b632d198c 100644 --- a/tests/Zend/Application/Resource/AllTests.php +++ b/tests/Zend/Application/Resource/AllTests.php @@ -59,7 +59,7 @@ class Zend_Application_Resource_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -88,6 +88,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_AllTests::main') { Zend_Application_Resource_AllTests::main(); } diff --git a/tests/Zend/Application/Resource/CacheManagerTest.php b/tests/Zend/Application/Resource/CacheManagerTest.php index 3f6b2c67ad..d6852ae27d 100644 --- a/tests/Zend/Application/Resource/CacheManagerTest.php +++ b/tests/Zend/Application/Resource/CacheManagerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -109,7 +109,7 @@ protected function setUp(): void $this->bootstrap = new ZfAppBootstrap($this->application); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -303,6 +303,6 @@ class Zend_Cache_Frontend_CustomNaming extends Zend_Cache_Core { } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_CacheManagerTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_CacheManagerTest::main') { Zend_Application_Resource_CacheManagerTest::main(); } diff --git a/tests/Zend/Application/Resource/DbTest.php b/tests/Zend/Application/Resource/DbTest.php index 86042a39e7..05fdc58424 100644 --- a/tests/Zend/Application/Resource/DbTest.php +++ b/tests/Zend/Application/Resource/DbTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -89,7 +89,7 @@ protected function setUp(): void $this->bootstrap = new ZfAppBootstrap($this->application); } - protected function tearDown(): void + protected function tear_down() { Zend_Db_Table::setDefaultMetadataCache(); @@ -136,6 +136,10 @@ public function testIsDefaultTableAdapter() $this->assertTrue($resource->isDefaultTableAdapter()); } + /** + * @requires extension pdo + * @requires extension pdo_sqlite + */ public function testPassingDatabaseConfigurationSetsObjectState() { require_once 'Zend/Application/Resource/Db.php'; @@ -152,6 +156,10 @@ public function testPassingDatabaseConfigurationSetsObjectState() $this->assertEquals($config['params'], $resource->getParams()); } + /** + * @requires extension pdo + * @requires extension pdo_sqlite + */ public function testInitShouldInitializeDbAdapter() { require_once 'Zend/Application/Resource/Db.php'; @@ -170,6 +178,8 @@ public function testInitShouldInitializeDbAdapter() /** * @group ZF-10033 + * @requires extension pdo + * @requires extension pdo_sqlite */ public function testSetDefaultMetadataCache() { @@ -192,6 +202,8 @@ public function testSetDefaultMetadataCache() /** * @group ZF-10033 + * @requires extension pdo + * @requires extension pdo_sqlite */ public function testSetDefaultMetadataCacheFromCacheManager() { @@ -226,6 +238,8 @@ public function testSetDefaultMetadataCacheFromCacheManager() /** * @group ZF-6620 + * @requires extension pdo + * @requires extension pdo_sqlite */ public function testSetOptionFetchMode() { @@ -246,6 +260,8 @@ public function testSetOptionFetchMode() /** * @group ZF-10543 + * @requires extension pdo + * @requires extension pdo_sqlite */ public function testSetDefaultMetadataCacheThroughBootstrap() { @@ -255,8 +271,8 @@ public function testSetDefaultMetadataCacheThroughBootstrap() 'adapter' => 'Pdo_Sqlite', 'params' => [ 'dbname' => ':memory:' - ], - 'defaultMetadataCache' => 'default' + ], + 'defaultMetadataCache' => 'default' ], 'cachemanager' => [ 'default' => [ @@ -273,6 +289,6 @@ public function testSetDefaultMetadataCacheThroughBootstrap() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_DbTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_DbTest::main') { Zend_Application_Resource_DbTest::main(); } diff --git a/tests/Zend/Application/Resource/DojoTest.php b/tests/Zend/Application/Resource/DojoTest.php index 694f7b8cd9..8091f71009 100644 --- a/tests/Zend/Application/Resource/DojoTest.php +++ b/tests/Zend/Application/Resource/DojoTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -91,7 +91,7 @@ protected function setUp(): void Zend_Controller_Front::getInstance()->resetInstance(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -144,6 +144,6 @@ public function testOptionsPassedToResourceAreUsedToSetDojosContainerState() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_DojoTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_DojoTest::main') { Zend_Application_Resource_DojoTest::main(); } diff --git a/tests/Zend/Application/Resource/FrontcontrollerTest.php b/tests/Zend/Application/Resource/FrontcontrollerTest.php index cbc27d4590..57ddba3bf7 100644 --- a/tests/Zend/Application/Resource/FrontcontrollerTest.php +++ b/tests/Zend/Application/Resource/FrontcontrollerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -94,7 +94,7 @@ protected function setUp(): void $this->bootstrap = new ZfAppBootstrap($this->application); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -440,6 +440,6 @@ class ZF9724_Dispatcher extends Zend_Controller_Dispatcher_Standard { } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_FrontcontrollerTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_FrontcontrollerTest::main') { Zend_Application_Resource_FrontcontrollerTest::main(); } diff --git a/tests/Zend/Application/Resource/LayoutTest.php b/tests/Zend/Application/Resource/LayoutTest.php index f47849a6de..776dc1be8c 100644 --- a/tests/Zend/Application/Resource/LayoutTest.php +++ b/tests/Zend/Application/Resource/LayoutTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -90,7 +90,7 @@ protected function setUp(): void Zend_Controller_Front::getInstance()->resetInstance(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -141,6 +141,6 @@ public function testOptionsPassedToResourceAreUsedToSetLayoutState() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_LayoutTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_LayoutTest::main') { Zend_Application_Resource_LayoutTest::main(); } diff --git a/tests/Zend/Application/Resource/LocaleTest.php b/tests/Zend/Application/Resource/LocaleTest.php index 2f14e23066..3688231b92 100644 --- a/tests/Zend/Application/Resource/LocaleTest.php +++ b/tests/Zend/Application/Resource/LocaleTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -90,7 +90,7 @@ protected function setUp(): void Zend_Registry::_unsetInstance(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -210,6 +210,6 @@ public function testSetCacheFromCacheManager() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_LocaleTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_LocaleTest::main') { Zend_Application_Resource_LocaleTest::main(); } diff --git a/tests/Zend/Application/Resource/LogTest.php b/tests/Zend/Application/Resource/LogTest.php index aab90e8ae6..9eb309d605 100644 --- a/tests/Zend/Application/Resource/LogTest.php +++ b/tests/Zend/Application/Resource/LogTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -88,7 +88,7 @@ protected function setUp(): void Zend_Controller_Front::getInstance()->resetInstance(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -211,6 +211,6 @@ public function testInitializationWithFilterAndFormatter() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_LogTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_LogTest::main') { Zend_Application_Resource_LogTest::main(); } diff --git a/tests/Zend/Application/Resource/MailTest.php b/tests/Zend/Application/Resource/MailTest.php index 969f3156d1..c9deafad87 100644 --- a/tests/Zend/Application/Resource/MailTest.php +++ b/tests/Zend/Application/Resource/MailTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -88,7 +88,7 @@ protected function setUp(): void Zend_Controller_Front::getInstance()->resetInstance(); } - protected function tearDown(): void + protected function tear_down() { Zend_Mail::clearDefaultTransport(); @@ -260,6 +260,6 @@ public function testOptionRegisterIsUnset() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_MailTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_MailTest::main') { Zend_Application_Resource_MailTest::main(); } diff --git a/tests/Zend/Application/Resource/ModulesTest.php b/tests/Zend/Application/Resource/ModulesTest.php index 2258489550..930e193982 100644 --- a/tests/Zend/Application/Resource/ModulesTest.php +++ b/tests/Zend/Application/Resource/ModulesTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -97,7 +97,7 @@ protected function setUp(): void $this->front->resetInstance(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -241,6 +241,6 @@ protected function bootstrapBootstraps($bootstraps) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_ModulesTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_ModulesTest::main') { Zend_Application_Resource_ModulesTest::main(); } diff --git a/tests/Zend/Application/Resource/MultidbTest.php b/tests/Zend/Application/Resource/MultidbTest.php index deca541969..7381a33ad4 100644 --- a/tests/Zend/Application/Resource/MultidbTest.php +++ b/tests/Zend/Application/Resource/MultidbTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -99,7 +101,7 @@ protected function setUp(): void Zend_Controller_Front::getInstance()->resetInstance(); } - protected function tearDown(): void + protected function tear_down() { Zend_Db_Table::setDefaultAdapter(null); Zend_Db_Table::setDefaultMetadataCache(); @@ -268,6 +270,6 @@ public function testSetDefaultMetadataCacheFromCacheManager() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_MultidbTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_MultidbTest::main') { Zend_Application_Resource_MultidbTest::main(); } diff --git a/tests/Zend/Application/Resource/NavigationTest.php b/tests/Zend/Application/Resource/NavigationTest.php index ae899bf9b5..1df8e72605 100644 --- a/tests/Zend/Application/Resource/NavigationTest.php +++ b/tests/Zend/Application/Resource/NavigationTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -90,7 +90,7 @@ protected function setUp(): void Zend_Registry::_unsetInstance(); } - protected function tearDown(): void + protected function tear_down() { Zend_Navigation_Page::setDefaultPageType(); @@ -236,6 +236,6 @@ public function testRegistryIsUsedWhenNumericRegistryValueIsGiven() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_NavigationTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_NavigationTest::main') { Zend_Application_Resource_NavigationTest::main(); } diff --git a/tests/Zend/Application/Resource/ResourceAbstractTest.php b/tests/Zend/Application/Resource/ResourceAbstractTest.php index 49ba29a6a9..e989351750 100644 --- a/tests/Zend/Application/Resource/ResourceAbstractTest.php +++ b/tests/Zend/Application/Resource/ResourceAbstractTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -89,7 +89,7 @@ protected function setUp(): void $this->bootstrap = new ZfAppBootstrap($this->application); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -216,6 +216,6 @@ public function testFirstResourceOptionShouldNotBeDropped() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_ResourceAbstractTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_ResourceAbstractTest::main') { Zend_Application_Resource_ResourceAbstractTest::main(); } diff --git a/tests/Zend/Application/Resource/RouterTest.php b/tests/Zend/Application/Resource/RouterTest.php index 592b98e790..349c6413bb 100644 --- a/tests/Zend/Application/Resource/RouterTest.php +++ b/tests/Zend/Application/Resource/RouterTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -88,7 +88,7 @@ protected function setUp(): void Zend_Controller_Front::getInstance()->resetInstance(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -155,6 +155,6 @@ public function testOptionsPassedToResourceAreUsedToCreateRoutes() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_RouterTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_RouterTest::main') { Zend_Application_Resource_RouterTest::main(); } diff --git a/tests/Zend/Application/Resource/SessionTest.php b/tests/Zend/Application/Resource/SessionTest.php index 155f70b0bc..53edfd9009 100644 --- a/tests/Zend/Application/Resource/SessionTest.php +++ b/tests/Zend/Application/Resource/SessionTest.php @@ -1,6 +1,6 @@ resource = new Zend_Application_Resource_Session(); } diff --git a/tests/Zend/Application/Resource/TranslateTest.php b/tests/Zend/Application/Resource/TranslateTest.php index 4dedff752c..a5bd842e25 100644 --- a/tests/Zend/Application/Resource/TranslateTest.php +++ b/tests/Zend/Application/Resource/TranslateTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -101,7 +101,7 @@ protected function setUp(): void Zend_Registry::_unsetInstance(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -276,6 +276,6 @@ public function testLogFactory() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_TranslateTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_TranslateTest::main') { Zend_Application_Resource_TranslateTest::main(); } diff --git a/tests/Zend/Application/Resource/UseragentTest.php b/tests/Zend/Application/Resource/UseragentTest.php index 89499f2ef0..383bc98085 100644 --- a/tests/Zend/Application/Resource/UseragentTest.php +++ b/tests/Zend/Application/Resource/UseragentTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -92,7 +92,7 @@ protected function setUp(): void Zend_Controller_Action_HelperBroker::resetHelpers(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -144,6 +144,6 @@ public function testInjectsUserAgentIntoViewHelperWhenViewResourcePresent() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_UseragentTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_UseragentTest::main') { Zend_Application_Resource_UseragentTest::main(); } diff --git a/tests/Zend/Application/Resource/ViewTest.php b/tests/Zend/Application/Resource/ViewTest.php index facd5b7966..30d94574da 100644 --- a/tests/Zend/Application/Resource/ViewTest.php +++ b/tests/Zend/Application/Resource/ViewTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -93,7 +93,7 @@ protected function setUp(): void Zend_Controller_Action_HelperBroker::resetHelpers(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -269,6 +269,6 @@ public function testViewResourceDoesNotReinjectViewRenderer() } -if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_ViewTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Application_Resource_ViewTest::main') { Zend_Application_Resource_ViewTest::main(); } diff --git a/tests/Zend/Auth/Adapter/AllTests.php b/tests/Zend/Auth/Adapter/AllTests.php index f456e4dc51..96f33a17ae 100644 --- a/tests/Zend/Auth/Adapter/AllTests.php +++ b/tests/Zend/Auth/Adapter/AllTests.php @@ -51,7 +51,7 @@ class Zend_Auth_Adapter_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -73,6 +73,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Auth_Adapter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Auth_Adapter_AllTests::main') { Zend_Auth_Adapter_AllTests::main(); } diff --git a/tests/Zend/Auth/Adapter/DbTable/AllTests.php b/tests/Zend/Auth/Adapter/DbTable/AllTests.php index d5f999d7a4..d8bdc7877f 100644 --- a/tests/Zend/Auth/Adapter/DbTable/AllTests.php +++ b/tests/Zend/Auth/Adapter/DbTable/AllTests.php @@ -48,7 +48,7 @@ class Zend_Auth_Adapter_DbTable_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -82,6 +82,6 @@ public static function suite() } -if (PHPUnit_MAIN_METHOD == 'Zend_Auth_Adapter_DbTable_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Auth_Adapter_DbTable_AllTests::main') { Zend_Auth_Adapter_DbTable_AllTests::main(); } diff --git a/tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php b/tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php index ab27e3ae08..f2615ad3c3 100644 --- a/tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php +++ b/tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php @@ -1,6 +1,6 @@ _setupDbAdapter(); $this->_setupAuthAdapter(); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; $this->_db->query('DROP TABLE [users]'); @@ -321,7 +321,7 @@ public function testCatchExceptionBadSql() */ public function testDbTableAdapterUsesCaseFolding() { - $this->tearDown(); + $this->tear_down(); $this->_setupDbAdapter([Zend_Db::CASE_FOLDING => Zend_Db::CASE_UPPER]); $this->_setupAuthAdapter(); @@ -486,7 +486,7 @@ protected function _setupAuthAdapter() class Zend_Auth_Adapter_DbTable_BasicSqliteTest_Skip extends Zend_Auth_Adapter_DbTable_BasicSqliteTest { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped('Zend_Auth_Adapter_DbTable Sqlite tests are not enabled in TestConfiguration.php'); } diff --git a/tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest/SkipTests.php b/tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest/SkipTests.php index 2f91fd400c..404fa45923 100644 --- a/tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest/SkipTests.php +++ b/tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest/SkipTests.php @@ -1,6 +1,6 @@ markTestSkipped($this->message); } diff --git a/tests/Zend/Auth/Adapter/DigestTest.php b/tests/Zend/Auth/Adapter/DigestTest.php index 59c53e6813..76515a6009 100644 --- a/tests/Zend/Auth/Adapter/DigestTest.php +++ b/tests/Zend/Auth/Adapter/DigestTest.php @@ -1,6 +1,6 @@ _filesPath = dirname(__FILE__) . '/Digest/_files'; } diff --git a/tests/Zend/Auth/Adapter/Http/AllTests.php b/tests/Zend/Auth/Adapter/Http/AllTests.php index ca57c13132..3837b7bffb 100644 --- a/tests/Zend/Auth/Adapter/Http/AllTests.php +++ b/tests/Zend/Auth/Adapter/Http/AllTests.php @@ -50,7 +50,7 @@ class Zend_Auth_Adapter_Http_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -71,6 +71,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Auth_Adapter_Http_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Auth_Adapter_Http_AllTests::main') { Zend_Auth_Adapter_Http_AllTests::main(); } diff --git a/tests/Zend/Auth/Adapter/Http/AuthTest.php b/tests/Zend/Auth/Adapter/Http/AuthTest.php index 47cfb263ae..953f036c5b 100644 --- a/tests/Zend/Auth/Adapter/Http/AuthTest.php +++ b/tests/Zend/Auth/Adapter/Http/AuthTest.php @@ -1,6 +1,6 @@ _filesPath = dirname(__FILE__) . '/_files'; $this->_basicResolver = new Zend_Auth_Adapter_Http_Resolver_File("{$this->_filesPath}/htbasic.1"); diff --git a/tests/Zend/Auth/Adapter/Http/ObjectTest.php b/tests/Zend/Auth/Adapter/Http/ObjectTest.php index 20afa9d7a5..18e205ba85 100644 --- a/tests/Zend/Auth/Adapter/Http/ObjectTest.php +++ b/tests/Zend/Auth/Adapter/Http/ObjectTest.php @@ -1,6 +1,6 @@ _filesPath = dirname(__FILE__) . '/_files'; $this->_basicResolver = new Zend_Auth_Adapter_Http_Resolver_File("$this->_filesPath/htbasic.1"); diff --git a/tests/Zend/Auth/Adapter/Http/ProxyTest.php b/tests/Zend/Auth/Adapter/Http/ProxyTest.php index 3177edf3bd..fecb3c2ac2 100644 --- a/tests/Zend/Auth/Adapter/Http/ProxyTest.php +++ b/tests/Zend/Auth/Adapter/Http/ProxyTest.php @@ -1,6 +1,6 @@ _filesPath = dirname(__FILE__) . '/_files'; $this->_basicResolver = new Zend_Auth_Adapter_Http_Resolver_File("{$this->_filesPath}/htbasic.1"); diff --git a/tests/Zend/Auth/Adapter/Http/Resolver/AllTests.php b/tests/Zend/Auth/Adapter/Http/Resolver/AllTests.php index 13d2b42781..1e5ceea759 100644 --- a/tests/Zend/Auth/Adapter/Http/Resolver/AllTests.php +++ b/tests/Zend/Auth/Adapter/Http/Resolver/AllTests.php @@ -47,7 +47,7 @@ class Zend_Auth_Adapter_Http_Resolver_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -65,6 +65,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Auth_Adapter_Http_Resolver_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Auth_Adapter_Http_Resolver_AllTests::main') { Zend_Auth_Adapter_Http_Resolver_AllTests::main(); } diff --git a/tests/Zend/Auth/Adapter/Http/Resolver/FileTest.php b/tests/Zend/Auth/Adapter/Http/Resolver/FileTest.php index e940c924ef..4a6e72c8a6 100644 --- a/tests/Zend/Auth/Adapter/Http/Resolver/FileTest.php +++ b/tests/Zend/Auth/Adapter/Http/Resolver/FileTest.php @@ -1,6 +1,6 @@ _filesPath = dirname(dirname(__FILE__)) . '/_files'; $this->_validPath = "$this->_filesPath/htdigest.3"; diff --git a/tests/Zend/Auth/Adapter/Ldap/AllTests.php b/tests/Zend/Auth/Adapter/Ldap/AllTests.php index f5bef37643..0f0b33b8c1 100644 --- a/tests/Zend/Auth/Adapter/Ldap/AllTests.php +++ b/tests/Zend/Auth/Adapter/Ldap/AllTests.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -78,7 +78,7 @@ public static function suite() */ class Zend_Auth_Adapter_Ldap_SkipOnlineTests extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped('Zend_Auth_Adapter_Ldap online tests not enabled in TestConfiguration.php'); } diff --git a/tests/Zend/Auth/Adapter/Ldap/OfflineTest.php b/tests/Zend/Auth/Adapter/Ldap/OfflineTest.php index 687c64e7fc..3ff6146ed7 100644 --- a/tests/Zend/Auth/Adapter/Ldap/OfflineTest.php +++ b/tests/Zend/Auth/Adapter/Ldap/OfflineTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Auth_Adapter_Ldap(); } diff --git a/tests/Zend/Auth/Adapter/Ldap/OnlineTest.php b/tests/Zend/Auth/Adapter/Ldap/OnlineTest.php index cde6ee8e5e..46ab7217e6 100644 --- a/tests/Zend/Auth/Adapter/Ldap/OnlineTest.php +++ b/tests/Zend/Auth/Adapter/Ldap/OnlineTest.php @@ -1,6 +1,6 @@ markTestSkipped('Extension "ldap" is required for this test to work'); + } $this->_options = [ 'host' => TESTS_ZEND_LDAP_HOST, 'username' => TESTS_ZEND_LDAP_USERNAME, diff --git a/tests/Zend/Auth/Adapter/OpenId/AllTests.php b/tests/Zend/Auth/Adapter/OpenId/AllTests.php index 877012e413..afbcc19c86 100644 --- a/tests/Zend/Auth/Adapter/OpenId/AllTests.php +++ b/tests/Zend/Auth/Adapter/OpenId/AllTests.php @@ -47,7 +47,7 @@ class Zend_Auth_Adapter_OpenId_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -66,6 +66,6 @@ public static function suite() } -if (PHPUnit_MAIN_METHOD == 'Zend_Auth_Adapter_OpenId_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Auth_Adapter_OpenId_AllTests::main') { Zend_Auth_Adapter_OpenId_AllTests::main(); } diff --git a/tests/Zend/Auth/Adapter/OpenId/OpenIdTest.php b/tests/Zend/Auth/Adapter/OpenId/OpenIdTest.php index 913aa68dcd..23a2a5e27b 100644 --- a/tests/Zend/Auth/Adapter/OpenId/OpenIdTest.php +++ b/tests/Zend/Auth/Adapter/OpenId/OpenIdTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -65,6 +65,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Auth_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Auth_AllTests::main') { Zend_Auth_AllTests::main(); } diff --git a/tests/Zend/AuthTest.php b/tests/Zend/AuthTest.php index ae205d6b52..1af8ceba7a 100644 --- a/tests/Zend/AuthTest.php +++ b/tests/Zend/AuthTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -111,6 +111,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Barcode_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Barcode_AllTests::main') { Zend_Barcode_AllTests::main(); } diff --git a/tests/Zend/Barcode/FactoryTest.php b/tests/Zend/Barcode/FactoryTest.php index d2d3529568..87f781c70e 100644 --- a/tests/Zend/Barcode/FactoryTest.php +++ b/tests/Zend/Barcode/FactoryTest.php @@ -1,6 +1,6 @@ _object = $this->_getBarcodeObject(); } - protected function tearDown(): void + protected function tear_down() { $this->_object = null; } diff --git a/tests/Zend/Barcode/Renderer/ImageTest.php b/tests/Zend/Barcode/Renderer/ImageTest.php index 7bc210feae..b1ad72a051 100644 --- a/tests/Zend/Barcode/Renderer/ImageTest.php +++ b/tests/Zend/Barcode/Renderer/ImageTest.php @@ -35,12 +35,12 @@ */ class Zend_Barcode_Renderer_ImageTest extends Zend_Barcode_Renderer_TestCommon { - protected function setUp(): void + protected function set_up() { if (!extension_loaded('gd')) { $this->markTestSkipped('Zend_Barcode_Renderer_ImageTest requires the GD extension'); } - parent::setUp(); + parent::set_up(); } protected function _getRendererObject($options = null) diff --git a/tests/Zend/Barcode/Renderer/TestCommon.php b/tests/Zend/Barcode/Renderer/TestCommon.php index a7f37bf539..36927ff310 100644 --- a/tests/Zend/Barcode/Renderer/TestCommon.php +++ b/tests/Zend/Barcode/Renderer/TestCommon.php @@ -1,6 +1,6 @@ _renderer = $this->_getRendererObject(); } - protected function tearDown(): void + protected function tear_down() { Zend_Barcode::setBarcodeFont(''); } diff --git a/tests/Zend/Cache/AllTests.php b/tests/Zend/Cache/AllTests.php index a3db16ab5a..c7d419b2ef 100644 --- a/tests/Zend/Cache/AllTests.php +++ b/tests/Zend/Cache/AllTests.php @@ -62,7 +62,7 @@ class Zend_Cache_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -263,6 +263,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cache_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cache_AllTests::main') { Zend_Cache_AllTests::main(); } diff --git a/tests/Zend/Cache/ApcBackendTest.php b/tests/Zend/Cache/ApcBackendTest.php index d8e34c5853..c1e66d6ba7 100644 --- a/tests/Zend/Cache/ApcBackendTest.php +++ b/tests/Zend/Cache/ApcBackendTest.php @@ -48,15 +48,15 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_Apc', $data, $dataName); } - public function setUp($notag = true): void + public function set_up($notag = true) { $this->_instance = new Zend_Cache_Backend_Apc([]); - parent::setUp($notag); + parent::set_up($notag); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); } diff --git a/tests/Zend/Cache/ClassFrontendTest.php b/tests/Zend/Cache/ClassFrontendTest.php index 6da11d0399..e80c62a500 100644 --- a/tests/Zend/Cache/ClassFrontendTest.php +++ b/tests/Zend/Cache/ClassFrontendTest.php @@ -1,6 +1,6 @@ _instance1) { $options1 = [ @@ -117,7 +117,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { unset($this->_instance1); unset($this->_instance2); diff --git a/tests/Zend/Cache/CommonBackendTest.php b/tests/Zend/Cache/CommonBackendTest.php index 14e3d2c653..1116062778 100644 --- a/tests/Zend/Cache/CommonBackendTest.php +++ b/tests/Zend/Cache/CommonBackendTest.php @@ -1,6 +1,6 @@ mkdir(); $this->_instance->setDirectives(['logging' => true]); @@ -89,7 +89,7 @@ public function getTmpDir($date = true) } } - protected function tearDown(): void + protected function tear_down() { if ($this->_instance) { $this->_instance->clean(); diff --git a/tests/Zend/Cache/CommonExtendedBackendTest.php b/tests/Zend/Cache/CommonExtendedBackendTest.php index 647d8ed096..7eed9ae8bf 100644 --- a/tests/Zend/Cache/CommonExtendedBackendTest.php +++ b/tests/Zend/Cache/CommonExtendedBackendTest.php @@ -42,9 +42,9 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct($name); } - public function setUp($notag = false): void + public function set_up($notag = false) { - parent::setUp($notag); + parent::set_up($notag); $this->_capabilities = $this->_instance->getCapabilities(); } diff --git a/tests/Zend/Cache/CoreTest.php b/tests/Zend/Cache/CoreTest.php index 56b2efe7e5..795f1b2fe8 100644 --- a/tests/Zend/Cache/CoreTest.php +++ b/tests/Zend/Cache/CoreTest.php @@ -1,6 +1,6 @@ _instance) { $this->_instance = new Zend_Cache_Core([]); @@ -59,7 +59,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { unset($this->_instance); } diff --git a/tests/Zend/Cache/FactoryException.php b/tests/Zend/Cache/FactoryException.php index a10eb8ae9d..9cd5a5fc8b 100644 --- a/tests/Zend/Cache/FactoryException.php +++ b/tests/Zend/Cache/FactoryException.php @@ -34,7 +34,7 @@ */ class Zend_Cache_FactoryException extends ExceptionTestCase { - public function setUp() + public function set_up() { $this->setExpectedException('Zend_Cache_Exception'); } diff --git a/tests/Zend/Cache/FactoryTest.php b/tests/Zend/Cache/FactoryTest.php index 1c673db5f7..12cfbd6554 100644 --- a/tests/Zend/Cache/FactoryTest.php +++ b/tests/Zend/Cache/FactoryTest.php @@ -1,6 +1,6 @@ mkdir(); $this->_cache_dir = $this->getTmpDir() . DIRECTORY_SEPARATOR; @@ -67,19 +67,21 @@ public function setUp($notag = false): void $logger = new Zend_Log(new Zend_Log_Writer_Null()); $this->_instance->setDirectives(['logger' => $logger]); - parent::setUp($notag); + parent::set_up($notag); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); } public function testSetDeprecatedHashedDirectoryUmask() { - $this->expectNotice(); - $this->expectNoticeMessage("'hashed_directory_umask' is deprecated -> please use 'hashed_directory_perm' instead"); + $this->expectException(\PHPUnit\Framework\Error\Notice::class); + $this->expectExceptionMessage("'hashed_directory_umask' is deprecated -> please use 'hashed_directory_perm' instead"); + //$this->expectException(\PHPUnit\Framework\Error\Notice::class); + //$this->expectExceptionMessage("'hashed_directory_umask' is deprecated -> please use 'hashed_directory_perm' instead"); $cache = new Zend_Cache_Backend_File([ 'cache_dir' => $this->_cache_dir, 'hashed_directory_umask' => 0700, @@ -89,8 +91,8 @@ public function testSetDeprecatedHashedDirectoryUmask() public function testSetDeprecatedCacheFileUmask() { # https://phpunit.readthedocs.io/en/9.5/writing-tests-for-phpunit.html?highlight=Error#testing-php-errors-warnings-and-notices - $this->expectNotice(); - $this->expectNoticeMessage("'cache_file_umask' is deprecated -> please use 'cache_file_perm' instead"); + $this->expectException(\PHPUnit\Framework\Error\Notice::class); + $this->expectExceptionMessage("'cache_file_umask' is deprecated -> please use 'cache_file_perm' instead"); $cache = new Zend_Cache_Backend_File([ 'cache_dir' => $this->_cache_dir, 'cache_file_umask' => 0700, diff --git a/tests/Zend/Cache/FileFrontendTest.php b/tests/Zend/Cache/FileFrontendTest.php index 778b383add..ce897da2ad 100644 --- a/tests/Zend/Cache/FileFrontendTest.php +++ b/tests/Zend/Cache/FileFrontendTest.php @@ -1,6 +1,6 @@ _masterFile = $this->_getTmpDirWindows() . DIRECTORY_SEPARATOR . 'zend_cache_master'; @@ -101,7 +101,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { unset($this->_instance1); unlink($this->_masterFile); diff --git a/tests/Zend/Cache/FunctionFrontendTest.php b/tests/Zend/Cache/FunctionFrontendTest.php index cba9939a73..d2db785958 100644 --- a/tests/Zend/Cache/FunctionFrontendTest.php +++ b/tests/Zend/Cache/FunctionFrontendTest.php @@ -1,6 +1,6 @@ _instance) { $this->_instance = new Zend_Cache_Frontend_Function([]); @@ -78,7 +78,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { unset($this->_instance); } diff --git a/tests/Zend/Cache/LibmemcachedBackendTest.php b/tests/Zend/Cache/LibmemcachedBackendTest.php index 257e9894b2..aaa28a8510 100644 --- a/tests/Zend/Cache/LibmemcachedBackendTest.php +++ b/tests/Zend/Cache/LibmemcachedBackendTest.php @@ -48,7 +48,7 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_Libmemcached', $data, $dataName); } - public function setUp($notag = true): void + public function set_up($notag = true) { if (!class_exists('Memcached')) { $this->markTestSkipped('Memcached is not installed, skipping test'); @@ -68,12 +68,12 @@ public function setUp($notag = true): void ], ]; $this->_instance = new Zend_Cache_Backend_Libmemcached($options); - parent::setUp($notag); + parent::set_up($notag); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); $this->_instance = null; // We have to wait after a memcached flush sleep(1); diff --git a/tests/Zend/Cache/ManagerTest.php b/tests/Zend/Cache/ManagerTest.php index 5d2d5cecb2..17d783ebf9 100644 --- a/tests/Zend/Cache/ManagerTest.php +++ b/tests/Zend/Cache/ManagerTest.php @@ -1,6 +1,6 @@ _cache_dir = $this->mkdir(); $this->_cache = Zend_Cache::factory( @@ -53,7 +53,7 @@ protected function setUp(): void ); } - protected function tearDown(): void + protected function tear_down() { $this->rmdir(); $this->_cache = null; diff --git a/tests/Zend/Cache/MemcachedBackendTest.php b/tests/Zend/Cache/MemcachedBackendTest.php index 27f97ec407..3c844a5c40 100644 --- a/tests/Zend/Cache/MemcachedBackendTest.php +++ b/tests/Zend/Cache/MemcachedBackendTest.php @@ -48,7 +48,7 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_Memcached', $data, $dataName); } - public function setUp($notag = true): void + public function set_up($notag = true) { if (!class_exists('Memcached')) { $this->markTestSkipped('Memcached is not installed, skipping test'); @@ -69,12 +69,12 @@ public function setUp($notag = true): void 'servers' => [$serverValid, $serverFail] ]; $this->_instance = new Zend_Cache_Backend_Memcached($options); - parent::setUp($notag); + parent::set_up($notag); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); // We have to wait after a memcache flush sleep(1); diff --git a/tests/Zend/Cache/OutputFrontendTest.php b/tests/Zend/Cache/OutputFrontendTest.php index 9d6094cc75..402770f29c 100644 --- a/tests/Zend/Cache/OutputFrontendTest.php +++ b/tests/Zend/Cache/OutputFrontendTest.php @@ -1,6 +1,6 @@ _instance) { $this->_instance = new Zend_Cache_Frontend_Output([]); @@ -56,7 +56,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { unset($this->_instance); } diff --git a/tests/Zend/Cache/PageFrontendTest.php b/tests/Zend/Cache/PageFrontendTest.php index 2984aef9c5..e3137d3d4b 100644 --- a/tests/Zend/Cache/PageFrontendTest.php +++ b/tests/Zend/Cache/PageFrontendTest.php @@ -1,6 +1,6 @@ _instance) { $this->_instance = new Zend_Cache_Frontend_Page([]); @@ -56,7 +56,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { unset($this->_instance); } diff --git a/tests/Zend/Cache/SkipTests.php b/tests/Zend/Cache/SkipTests.php index 2f012bc9c3..5c8c987e80 100644 --- a/tests/Zend/Cache/SkipTests.php +++ b/tests/Zend/Cache/SkipTests.php @@ -1,6 +1,6 @@ markTestSkipped($this->message); } diff --git a/tests/Zend/Cache/SqliteBackendTest.php b/tests/Zend/Cache/SqliteBackendTest.php index 1f336d9996..f649d00fdc 100644 --- a/tests/Zend/Cache/SqliteBackendTest.php +++ b/tests/Zend/Cache/SqliteBackendTest.php @@ -49,19 +49,19 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_Sqlite', $data, $dataName); } - public function setUp($notag = false): void + public function set_up($notag = false) { @mkdir($this->getTmpDir()); $this->_cache_dir = $this->getTmpDir() . DIRECTORY_SEPARATOR; $this->_instance = new Zend_Cache_Backend_Sqlite([ 'cache_db_complete_path' => $this->_cache_dir . 'cache.db' ]); - parent::setUp($notag); + parent::set_up($notag); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); @unlink($this->_cache_dir . 'cache.db'); $this->rmdir(); @@ -94,7 +94,7 @@ public function testCleanModeAllWithVacuum() 'cache_db_complete_path' => $this->_cache_dir . 'cache.db', 'automatic_vacuum_factor' => 1 ]); - parent::setUp(); + parent::set_up(); $this->assertTrue($this->_instance->clean('all')); $this->assertFalse($this->_instance->test('bar')); $this->assertFalse($this->_instance->test('bar2')); @@ -106,7 +106,7 @@ public function testRemoveCorrectCallWithVacuum() 'cache_db_complete_path' => $this->_cache_dir . 'cache.db', 'automatic_vacuum_factor' => 1 ]); - parent::setUp(); + parent::set_up(); $this->assertTrue($this->_instance->remove('bar')); $this->assertFalse($this->_instance->test('bar')); @@ -123,7 +123,7 @@ public function testRemoveCorrectCallWithVacuumOnMemoryDb() 'cache_db_complete_path' => ':memory:', 'automatic_vacuum_factor' => 1 ]); - parent::setUp(); + parent::set_up(); $this->assertGreaterThan(0, $this->_instance->test('bar2')); diff --git a/tests/Zend/Cache/StaticBackendTest.php b/tests/Zend/Cache/StaticBackendTest.php index b28ee1a19d..5d9ffc0117 100644 --- a/tests/Zend/Cache/StaticBackendTest.php +++ b/tests/Zend/Cache/StaticBackendTest.php @@ -38,7 +38,7 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_Static', $data, $dataName); } - public function setUp($notag = false): void + public function set_up($notag = false) { $this->mkdir(); $this->_cache_dir = $this->mkdir(); @@ -69,9 +69,9 @@ public function setUp($notag = false): void $this->_instance->save('bar3 : data to cache', bin2hex('/bar3'), ['tag2', 'tag3']); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); $_SERVER['REQUEST_URI'] = $this->_requestUriOld; $this->rmdir(); @@ -164,8 +164,8 @@ public function testDirectoryPermAsString() */ public function testDirectoryUmaskTriggersError() { - $this->expectNotice(); - $this->expectNoticeMessage("'cache_directory_umask' is deprecated -> please use 'cache_directory_perm' instead"); + $this->expectException(\PHPUnit\Framework\Error\Notice::class); + $this->expectExceptionMessage("'cache_directory_umask' is deprecated -> please use 'cache_directory_perm' instead"); $this->_instance->setOption('cache_directory_umask', '777'); } @@ -174,8 +174,8 @@ public function testDirectoryUmaskTriggersError() */ public function testFileUmaskTriggersError() { - $this->expectNotice(); - $this->expectNoticeMessage("'cache_file_umask' is deprecated -> please use 'cache_file_perm' instead"); + $this->expectException(\PHPUnit\Framework\Error\Notice::class); + $this->expectExceptionMessage("'cache_file_umask' is deprecated -> please use 'cache_file_perm' instead"); $this->_instance->setOption('cache_file_umask', '777'); } diff --git a/tests/Zend/Cache/TwoLevelsBackendTest.php b/tests/Zend/Cache/TwoLevelsBackendTest.php index 84640ac1f5..70cc1d30cd 100644 --- a/tests/Zend/Cache/TwoLevelsBackendTest.php +++ b/tests/Zend/Cache/TwoLevelsBackendTest.php @@ -50,7 +50,7 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_TwoLevels', $data, $dataName); } - public function setUp($notag = false): void + public function set_up($notag = false) { @mkdir($this->getTmpDir()); $this->_cache_dir = $this->getTmpDir() . DIRECTORY_SEPARATOR; @@ -67,12 +67,12 @@ public function setUp($notag = false): void 'fast_backend_options' => $fastBackendOptions, 'slow_backend_options' => $slowBackendOptions ]); - parent::setUp($notag); + parent::set_up($notag); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); } diff --git a/tests/Zend/Cache/WinCacheBackendTest.php b/tests/Zend/Cache/WinCacheBackendTest.php index 1d8f27d012..15fcf0868a 100644 --- a/tests/Zend/Cache/WinCacheBackendTest.php +++ b/tests/Zend/Cache/WinCacheBackendTest.php @@ -48,15 +48,15 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_WinCache', $data, $dataName); } - public function setUp($notag = true): void + public function set_up($notag = true) { $this->_instance = new Zend_Cache_Backend_WinCache([]); - parent::setUp($notag); + parent::set_up($notag); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); } diff --git a/tests/Zend/Cache/XcacheBackendTest.php b/tests/Zend/Cache/XcacheBackendTest.php index 3455d3a238..0147128e6a 100644 --- a/tests/Zend/Cache/XcacheBackendTest.php +++ b/tests/Zend/Cache/XcacheBackendTest.php @@ -48,18 +48,18 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_Xcache', $data, $dataName); } - public function setUp($notag = true): void + public function set_up($notag = true) { $this->_instance = new Zend_Cache_Backend_Xcache([ 'user' => TESTS_ZEND_CACHE_XCACHE_USER, 'password' => TESTS_ZEND_CACHE_XCACHE_PASSWORD ]); - parent::setUp($notag); + parent::set_up($notag); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); } diff --git a/tests/Zend/Cache/ZendPlatformBackendTest.php b/tests/Zend/Cache/ZendPlatformBackendTest.php index 8701b3c70e..4e47b1877e 100644 --- a/tests/Zend/Cache/ZendPlatformBackendTest.php +++ b/tests/Zend/Cache/ZendPlatformBackendTest.php @@ -48,19 +48,19 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_ZendPlatform', $data, $dataName); } - public function setUp($notag = false): void + public function set_up($notag = false) { if (!function_exists('output_cache_get')) { $this->markTestSkipped('Zend Platform is not installed, skipping test'); return; } $this->_instance = new Zend_Cache_Backend_ZendPlatform([]); - parent::setUp($notag); + parent::set_up($notag); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); } diff --git a/tests/Zend/Cache/ZendServerDiskTest.php b/tests/Zend/Cache/ZendServerDiskTest.php index 455ef16ad2..5d1e26cd43 100755 --- a/tests/Zend/Cache/ZendServerDiskTest.php +++ b/tests/Zend/Cache/ZendServerDiskTest.php @@ -48,15 +48,15 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_ZendServer_Disk', $data, $dataName); } - public function setUp($notag = true): void + public function set_up($notag = true) { $this->_instance = new Zend_Cache_Backend_ZendServer_Disk(); - parent::setUp(true); + parent::set_up(true); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); } diff --git a/tests/Zend/Cache/ZendServerShMemTest.php b/tests/Zend/Cache/ZendServerShMemTest.php index 8d729daab0..4da810fc77 100755 --- a/tests/Zend/Cache/ZendServerShMemTest.php +++ b/tests/Zend/Cache/ZendServerShMemTest.php @@ -48,15 +48,15 @@ public function __construct($name = null, array $data = [], $dataName = '') parent::__construct('Zend_Cache_Backend_ZendServer_Disk', $data, $dataName); } - public function setUp($notag = true): void + public function set_up($notag = true) { $this->_instance = new Zend_Cache_Backend_ZendServer_ShMem(); - parent::setUp(true); + parent::set_up(true); } - protected function tearDown(): void + protected function tear_down() { - parent::tearDown(); + parent::tear_down(); unset($this->_instance); } diff --git a/tests/Zend/Captcha/AllTests.php b/tests/Zend/Captcha/AllTests.php index 936bd24297..5a6879a0ba 100644 --- a/tests/Zend/Captcha/AllTests.php +++ b/tests/Zend/Captcha/AllTests.php @@ -45,7 +45,7 @@ class Zend_Captcha_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -61,6 +61,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Captcha_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Captcha_AllTests::main') { Zend_Captcha_AllTests::main(); } diff --git a/tests/Zend/Captcha/DumbTest.php b/tests/Zend/Captcha/DumbTest.php index 0ac284ef41..a262ad61ca 100644 --- a/tests/Zend/Captcha/DumbTest.php +++ b/tests/Zend/Captcha/DumbTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -70,7 +70,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (isset($this->word)) { unset($this->word); @@ -94,7 +94,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -182,6 +182,6 @@ public function __call($method, $args) } // Call Zend_Captcha_DumbTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Captcha_DumbTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Captcha_DumbTest::main") { Zend_Captcha_DumbTest::main(); } diff --git a/tests/Zend/Captcha/FigletTest.php b/tests/Zend/Captcha/FigletTest.php index 16ee2a089d..858219fcc8 100644 --- a/tests/Zend/Captcha/FigletTest.php +++ b/tests/Zend/Captcha/FigletTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -81,7 +81,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (isset($this->word)) { unset($this->word); @@ -105,7 +105,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -300,7 +300,7 @@ public function testShouldNotValidateEmptyInputAgainstEmptySession() // Unset the generated word // we have to reset $this->captcha for that $this->captcha->getSession()->word = null; - $this->setUp(); + $this->set_up(); $this->captcha->setName('foo') ->setWordLen(6) ->setTimeout(300); @@ -391,6 +391,6 @@ public function __call($method, $args) } // Call Zend_Captcha_FigletTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Captcha_FigletTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Captcha_FigletTest::main") { Zend_Captcha_FigletTest::main(); } diff --git a/tests/Zend/Captcha/ImageTest.php b/tests/Zend/Captcha/ImageTest.php index c5c39c4ab8..aabb4fb82d 100644 --- a/tests/Zend/Captcha/ImageTest.php +++ b/tests/Zend/Captcha/ImageTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -87,7 +87,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (!extension_loaded('gd')) { $this->markTestSkipped('The GD extension is not available.'); @@ -124,7 +124,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { // remove chaptcha images foreach (new DirectoryIterator((string) $this->testDir) as $file) { @@ -443,6 +443,6 @@ public function __call($method, $args) } // Call Zend_Captcha_ImageTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Captcha_ImageTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Captcha_ImageTest::main") { Zend_Captcha_ImageTest::main(); } diff --git a/tests/Zend/Captcha/ReCaptchaTest.php b/tests/Zend/Captcha/ReCaptchaTest.php index a8a65073f2..2064b58a24 100644 --- a/tests/Zend/Captcha/ReCaptchaTest.php +++ b/tests/Zend/Captcha/ReCaptchaTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -72,7 +72,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (isset($this->word)) { unset($this->word); @@ -96,7 +96,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -266,6 +266,6 @@ public function __call($method, $args) } // Call Zend_Captcha_ReCaptchaTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Captcha_ReCaptchaTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Captcha_ReCaptchaTest::main") { Zend_Captcha_ReCaptchaTest::main(); } diff --git a/tests/Zend/Cloud/AllTests.php b/tests/Zend/Cloud/AllTests.php index 86310c42bd..65d774d7a2 100644 --- a/tests/Zend/Cloud/AllTests.php +++ b/tests/Zend/Cloud/AllTests.php @@ -59,7 +59,7 @@ class Zend_Cloud_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -75,6 +75,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_AllTests::main') { Zend_Cloud_AllTests::main(); } diff --git a/tests/Zend/Cloud/DocumentService/Adapter/AllTests.php b/tests/Zend/Cloud/DocumentService/Adapter/AllTests.php index 3e462e7a45..17a2b1296a 100755 --- a/tests/Zend/Cloud/DocumentService/Adapter/AllTests.php +++ b/tests/Zend/Cloud/DocumentService/Adapter/AllTests.php @@ -54,7 +54,7 @@ class Zend_Cloud_DocumentService_Adapter_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -73,6 +73,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_DocumentService_Adapter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_DocumentService_Adapter_AllTests::main') { Zend_Cloud_DocumentService_Adapter_AllTests::main(); } diff --git a/tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php b/tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php index 15262859d5..671e37e96a 100755 --- a/tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php +++ b/tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php @@ -70,7 +70,7 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDbTest extends Zend_Cloud_Documen public static function main() { $suite = new TestSuite(__CLASS__); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } public function testUpdateDocumentMergeAll() @@ -197,6 +197,6 @@ protected function _queryString($domain, $s1, $s2) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_DocumentService_Adapter_SimpleDbTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_DocumentService_Adapter_SimpleDbTest::main') { Zend_Cloud_DocumentService_Adapter_SimpleDbTest::main(); } diff --git a/tests/Zend/Cloud/DocumentService/Adapter/WindowsAzureTest.php b/tests/Zend/Cloud/DocumentService/Adapter/WindowsAzureTest.php index 1a3093572d..70ce782382 100755 --- a/tests/Zend/Cloud/DocumentService/Adapter/WindowsAzureTest.php +++ b/tests/Zend/Cloud/DocumentService/Adapter/WindowsAzureTest.php @@ -75,7 +75,7 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzureTest extends Zend_Cloud_Doc public static function main() { $suite = new TestSuite(__CLASS__); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } public function testQueryStructOrder() @@ -160,6 +160,6 @@ protected function _queryString($domain, $s1, $s2) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_DocumentService_Adapter_WindowsAzureTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_DocumentService_Adapter_WindowsAzureTest::main') { Zend_Cloud_DocumentService_Adapter_WindowsAzureTest::main(); } diff --git a/tests/Zend/Cloud/DocumentService/AllTests.php b/tests/Zend/Cloud/DocumentService/AllTests.php index 235079374b..360bfe633f 100644 --- a/tests/Zend/Cloud/DocumentService/AllTests.php +++ b/tests/Zend/Cloud/DocumentService/AllTests.php @@ -46,7 +46,7 @@ class Zend_Cloud_DocumentService_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -60,6 +60,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_DocumentService_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_DocumentService_AllTests::main') { Zend_Cloud_DocumentService_AllTests::main(); } diff --git a/tests/Zend/Cloud/DocumentService/FactoryTest.php b/tests/Zend/Cloud/DocumentService/FactoryTest.php index 30c1f2ae54..39267399ba 100644 --- a/tests/Zend/Cloud/DocumentService/FactoryTest.php +++ b/tests/Zend/Cloud/DocumentService/FactoryTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testGetDocumentAdapterKey() @@ -85,6 +85,6 @@ public function testGetAdapterWithConfig() } // Call Zend_Cloud_DocumentService_FactoryTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Cloud_DocumentService_FactoryTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Cloud_DocumentService_FactoryTest::main") { Zend_Cloud_DocumentService_FactoryTest::main(); } diff --git a/tests/Zend/Cloud/DocumentService/TestCase.php b/tests/Zend/Cloud/DocumentService/TestCase.php index f241d53ebc..703ca3313a 100644 --- a/tests/Zend/Cloud/DocumentService/TestCase.php +++ b/tests/Zend/Cloud/DocumentService/TestCase.php @@ -1,6 +1,6 @@ _commonDocument->deleteCollection($name); } - protected function setUp(): void + protected function set_up() { $this->_config = $this->_getConfig(); $this->_commonDocument = Zend_Cloud_DocumentService_Factory::getAdapter($this->_config); - parent::setUp(); + parent::set_up(); } abstract protected function _getConfig(); diff --git a/tests/Zend/Cloud/Infrastructure/Adapter/AllTests.php b/tests/Zend/Cloud/Infrastructure/Adapter/AllTests.php index 03edec6107..24355f3f30 100755 --- a/tests/Zend/Cloud/Infrastructure/Adapter/AllTests.php +++ b/tests/Zend/Cloud/Infrastructure/Adapter/AllTests.php @@ -54,7 +54,7 @@ class Zend_Cloud_Infrastructure_Adapter_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -73,6 +73,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_Infrastructure_Adapter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_Infrastructure_Adapter_AllTests::main') { Zend_Cloud_Infrastructure_Adapter_AllTests::main(); } diff --git a/tests/Zend/Cloud/Infrastructure/Adapter/Ec2Test.php b/tests/Zend/Cloud/Infrastructure/Adapter/Ec2Test.php index 286500c115..f89bacad3a 100644 --- a/tests/Zend/Cloud/Infrastructure/Adapter/Ec2Test.php +++ b/tests/Zend/Cloud/Infrastructure/Adapter/Ec2Test.php @@ -1,6 +1,6 @@ infrastructure = Zend_Cloud_Infrastructure_Factory::getAdapter([ Zend_Cloud_Infrastructure_Factory::INFRASTRUCTURE_ADAPTER_KEY => 'Zend_Cloud_Infrastructure_Adapter_Ec2', @@ -246,4 +246,4 @@ public function testDestroyInstance() { $this->assertTrue($this->infrastructure->destroyInstance(self::$instanceId)); } -} \ No newline at end of file +} diff --git a/tests/Zend/Cloud/Infrastructure/Adapter/RackspaceTest.php b/tests/Zend/Cloud/Infrastructure/Adapter/RackspaceTest.php index 0b6b74e9cc..0c0de90c7c 100644 --- a/tests/Zend/Cloud/Infrastructure/Adapter/RackspaceTest.php +++ b/tests/Zend/Cloud/Infrastructure/Adapter/RackspaceTest.php @@ -1,6 +1,6 @@ infrastructure = Zend_Cloud_Infrastructure_Factory::getAdapter([ Zend_Cloud_Infrastructure_Factory::INFRASTRUCTURE_ADAPTER_KEY => 'Zend_Cloud_Infrastructure_Adapter_Rackspace', @@ -232,6 +232,6 @@ public function testDestroyInstance() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_Infrastructure_Adapter_RackspaceTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_Infrastructure_Adapter_RackspaceTest::main') { Zend_Cloud_Infrastructure_Adapter_RackspaceTest::main(); } diff --git a/tests/Zend/Cloud/Infrastructure/AllTests.php b/tests/Zend/Cloud/Infrastructure/AllTests.php index 3fd7dd729d..1f61f9a0f2 100644 --- a/tests/Zend/Cloud/Infrastructure/AllTests.php +++ b/tests/Zend/Cloud/Infrastructure/AllTests.php @@ -46,7 +46,7 @@ class Zend_Cloud_Infrastructure_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -60,6 +60,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_Infrastructure_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_Infrastructure_AllTests::main') { Zend_Cloud_Infrastructure_AllTests::main(); } diff --git a/tests/Zend/Cloud/Infrastructure/FactoryTest.php b/tests/Zend/Cloud/Infrastructure/FactoryTest.php index 161a7ef6b9..a4871e2298 100644 --- a/tests/Zend/Cloud/Infrastructure/FactoryTest.php +++ b/tests/Zend/Cloud/Infrastructure/FactoryTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testGetInfrastructureAdapterKey() @@ -91,6 +91,6 @@ public function testGetAdapterWithConfig() } // Call Zend_Cloud_Infrastructure_FactoryTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Cloud_Infrastructure_FactoryTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Cloud_Infrastructure_FactoryTest::main") { Zend_Cloud_Infrastructure_FactoryTest::main(); } diff --git a/tests/Zend/Cloud/Infrastructure/TestCase.php b/tests/Zend/Cloud/Infrastructure/TestCase.php index baeb3332a9..4588d5b011 100644 --- a/tests/Zend/Cloud/Infrastructure/TestCase.php +++ b/tests/Zend/Cloud/Infrastructure/TestCase.php @@ -1,6 +1,6 @@ assertEquals('ZendTest\Cloud\Infrastructure\TestAsset\MockAdapter::deployInstance', $this->_commonInfrastructure->deploy('foo', 'bar')); } - protected function setUp(): void + protected function set_up() { $this->_config = $this->_getConfig(); $this->_commonInfrastructure = Zend_Cloud_Infrastructure_Factory::getAdapter($this->_config); - parent::setUp(); + parent::set_up(); } abstract protected function _getConfig(); diff --git a/tests/Zend/Cloud/QueueService/Adapter/AllTests.php b/tests/Zend/Cloud/QueueService/Adapter/AllTests.php index 640813ce35..2c3eef880b 100644 --- a/tests/Zend/Cloud/QueueService/Adapter/AllTests.php +++ b/tests/Zend/Cloud/QueueService/Adapter/AllTests.php @@ -58,7 +58,7 @@ class Zend_Cloud_QueueService_Adapter_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -78,6 +78,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_QueueService_Adapter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_QueueService_Adapter_AllTests::main') { Zend_Cloud_QueueService_Adapter_AllTests::main(); } diff --git a/tests/Zend/Cloud/QueueService/Adapter/SqsTest.php b/tests/Zend/Cloud/QueueService/Adapter/SqsTest.php index 59e0b468bf..8b8efc9f56 100644 --- a/tests/Zend/Cloud/QueueService/Adapter/SqsTest.php +++ b/tests/Zend/Cloud/QueueService/Adapter/SqsTest.php @@ -65,7 +65,7 @@ class Zend_Cloud_QueueService_Adapter_SqsTest extends Zend_Cloud_QueueService_Te public static function main() { $suite = new TestSuite(__CLASS__); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,9 +73,9 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); // Isolate the tests from slow deletes $this->_wait(); } @@ -153,6 +153,6 @@ protected function _getConfig() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_QueueService_Adapter_SqsTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_QueueService_Adapter_SqsTest::main') { Zend_Cloud_QueueService_Adapter_SqsTest::main(); } diff --git a/tests/Zend/Cloud/QueueService/Adapter/WindowsAzureTest.php b/tests/Zend/Cloud/QueueService/Adapter/WindowsAzureTest.php index a2cf4eefff..2bed802985 100755 --- a/tests/Zend/Cloud/QueueService/Adapter/WindowsAzureTest.php +++ b/tests/Zend/Cloud/QueueService/Adapter/WindowsAzureTest.php @@ -65,7 +65,7 @@ class Zend_Cloud_QueueService_Adapter_WindowsAzureTest extends Zend_Cloud_QueueS public static function main() { $suite = new TestSuite(__CLASS__); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,9 +73,9 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); $this->_wait(); } @@ -102,6 +102,6 @@ protected function _getConfig() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_QueueService_Adapter_WindowsAzureTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_QueueService_Adapter_WindowsAzureTest::main') { Zend_Cloud_QueueService_Adapter_WindowsAzureTest::main(); } diff --git a/tests/Zend/Cloud/QueueService/Adapter/ZendQueueTest.php b/tests/Zend/Cloud/QueueService/Adapter/ZendQueueTest.php index 8d0d6d275c..a99be9a75e 100755 --- a/tests/Zend/Cloud/QueueService/Adapter/ZendQueueTest.php +++ b/tests/Zend/Cloud/QueueService/Adapter/ZendQueueTest.php @@ -65,7 +65,7 @@ class Zend_Cloud_QueueService_Adapter_ZendQueueTest extends Zend_Cloud_QueueServ public static function main() { $suite = new TestSuite(__CLASS__); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } public function testPeekMessages() @@ -84,6 +84,6 @@ protected function _getConfig() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_QueueService_Adapter_ZendQueueTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_QueueService_Adapter_ZendQueueTest::main') { Zend_Cloud_QueueService_Adapter_ZendQueueTest::main(); } diff --git a/tests/Zend/Cloud/QueueService/AllTests.php b/tests/Zend/Cloud/QueueService/AllTests.php index 2d7ee51d07..c48c9e5763 100644 --- a/tests/Zend/Cloud/QueueService/AllTests.php +++ b/tests/Zend/Cloud/QueueService/AllTests.php @@ -46,7 +46,7 @@ class Zend_Cloud_QueueService_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -60,6 +60,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_QueueService_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_QueueService_AllTests::main') { Zend_Cloud_QueueService_AllTests::main(); } diff --git a/tests/Zend/Cloud/QueueService/FactoryTest.php b/tests/Zend/Cloud/QueueService/FactoryTest.php index 929c0a6911..5b95939eb2 100755 --- a/tests/Zend/Cloud/QueueService/FactoryTest.php +++ b/tests/Zend/Cloud/QueueService/FactoryTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testGetQueueAdapterKey() @@ -101,6 +101,6 @@ public function testGetAdapterWithArray() } // Call Zend_Cloud_QueueService_FactoryTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Cloud_QueueService_FactoryTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Cloud_QueueService_FactoryTest::main") { Zend_Cloud_QueueService_FactoryTest::main(); } diff --git a/tests/Zend/Cloud/QueueService/TestCase.php b/tests/Zend/Cloud/QueueService/TestCase.php index 9d4391d318..c886296931 100644 --- a/tests/Zend/Cloud/QueueService/TestCase.php +++ b/tests/Zend/Cloud/QueueService/TestCase.php @@ -1,6 +1,6 @@ _config = $this->_getConfig(); $this->_commonQueue = Zend_Cloud_QueueService_Factory::getAdapter($this->_config); diff --git a/tests/Zend/Cloud/StorageService/Adapter/AllTests.php b/tests/Zend/Cloud/StorageService/Adapter/AllTests.php index 6a9b22edc5..ad6b271ba2 100644 --- a/tests/Zend/Cloud/StorageService/Adapter/AllTests.php +++ b/tests/Zend/Cloud/StorageService/Adapter/AllTests.php @@ -64,7 +64,7 @@ class Zend_Cloud_StorageService_Adapter_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -85,6 +85,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_StorageService_Adapter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_StorageService_Adapter_AllTests::main') { Zend_Cloud_StorageService_Adapter_AllTests::main(); } diff --git a/tests/Zend/Cloud/StorageService/Adapter/FileSystemTest.php b/tests/Zend/Cloud/StorageService/Adapter/FileSystemTest.php index 8e873a9f1d..d2167d8d37 100644 --- a/tests/Zend/Cloud/StorageService/Adapter/FileSystemTest.php +++ b/tests/Zend/Cloud/StorageService/Adapter/FileSystemTest.php @@ -56,7 +56,7 @@ class Zend_Cloud_StorageService_Adapter_FileSystemTest extends Zend_Cloud_Storag public static function main() { $suite = new TestSuite(__CLASS__); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -64,9 +64,9 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); // No need to wait $this->_waitPeriod = 0; $path = $this->_config->local_directory; @@ -109,7 +109,7 @@ public function testDeleteMetadata() * * @return void */ - protected function tearDown(): void + protected function tear_down() { $path = $this->_config->local_directory; @@ -118,7 +118,7 @@ protected function tearDown(): void $this->_rmRecursive($path); } - parent::tearDown(); + parent::tear_down(); } protected function _rmRecursive($path) @@ -151,6 +151,6 @@ protected function _getConfig() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_StorageService_Adapter_FileSystemTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_StorageService_Adapter_FileSystemTest::main') { Zend_Cloud_StorageService_Adapter_FileSystemTest::main(); } diff --git a/tests/Zend/Cloud/StorageService/Adapter/RackspaceTest.php b/tests/Zend/Cloud/StorageService/Adapter/RackspaceTest.php index e755194283..b57a74d4b1 100644 --- a/tests/Zend/Cloud/StorageService/Adapter/RackspaceTest.php +++ b/tests/Zend/Cloud/StorageService/Adapter/RackspaceTest.php @@ -56,13 +56,13 @@ public function testStoreItemStream() * * @return void */ - protected function setUp(): void + protected function set_up() { if (!constant('TESTS_ZEND_SERVICE_RACKSPACE_ONLINE_ENABLED')) { $this->markTestSkipped('Rackspace online tests are not enabled'); } - parent::setUp(); + parent::set_up(); $this->_waitPeriod = 5; // Create the container here @@ -80,7 +80,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { if (!$this->_config) { return; @@ -106,7 +106,7 @@ protected function tearDown(): void $this->_config->get(Zend_Cloud_StorageService_Adapter_Rackspace::REMOTE_CONTAINER) ); - parent::tearDown(); + parent::tear_down(); } protected function _getConfig() @@ -130,6 +130,6 @@ protected function _getConfig() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_StorageService_Adapter_RackspaceTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_StorageService_Adapter_RackspaceTest::main') { Zend_Cloud_StorageService_Adapter_RackspaceTest::main(); } diff --git a/tests/Zend/Cloud/StorageService/Adapter/S3Test.php b/tests/Zend/Cloud/StorageService/Adapter/S3Test.php index 66b3a29175..d43e5b03f7 100644 --- a/tests/Zend/Cloud/StorageService/Adapter/S3Test.php +++ b/tests/Zend/Cloud/StorageService/Adapter/S3Test.php @@ -57,7 +57,7 @@ class Zend_Cloud_StorageService_Adapter_S3Test extends Zend_Cloud_StorageService public static function main() { $suite = new TestSuite(__CLASS__); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -65,9 +65,9 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); // Create the bucket here $s3 = new Zend_Service_Amazon_S3( @@ -102,7 +102,7 @@ public function testDeleteMetadata() * * @return void */ - protected function tearDown(): void + protected function tear_down() { if (!$this->_config) { return; @@ -116,7 +116,7 @@ protected function tearDown(): void $s3->removeBucket( $this->_config->get(Zend_Cloud_StorageService_Adapter_S3::BUCKET_NAME) ); - parent::tearDown(); + parent::tear_down(); } protected function _getConfig() @@ -141,6 +141,6 @@ protected function _getConfig() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_StorageService_Adapter_S3Test::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_StorageService_Adapter_S3Test::main') { Zend_Cloud_StorageService_Adapter_S3Test::main(); } diff --git a/tests/Zend/Cloud/StorageService/Adapter/WindowsAzureTest.php b/tests/Zend/Cloud/StorageService/Adapter/WindowsAzureTest.php index 8ec4c325bf..d9e8a50d1c 100644 --- a/tests/Zend/Cloud/StorageService/Adapter/WindowsAzureTest.php +++ b/tests/Zend/Cloud/StorageService/Adapter/WindowsAzureTest.php @@ -58,7 +58,7 @@ class Zend_Cloud_StorageService_Adapter_WindowsAzureTest extends Zend_Cloud_Stor public static function main() { $suite = new TestSuite(__CLASS__); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } protected function _getConfig() @@ -87,6 +87,6 @@ protected function _getConfig() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_StorageService_Adapter_WindowsAzureTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_StorageService_Adapter_WindowsAzureTest::main') { Zend_Cloud_StorageService_Adapter_WindowsAzureTest::main(); } diff --git a/tests/Zend/Cloud/StorageService/AllTests.php b/tests/Zend/Cloud/StorageService/AllTests.php index 62c169ffaa..72fd8aa754 100644 --- a/tests/Zend/Cloud/StorageService/AllTests.php +++ b/tests/Zend/Cloud/StorageService/AllTests.php @@ -46,7 +46,7 @@ class Zend_Cloud_StorageService_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -60,6 +60,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_StorageService_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Cloud_StorageService_AllTests::main') { Zend_Cloud_StorageService_AllTests::main(); } diff --git a/tests/Zend/Cloud/StorageService/FactoryTest.php b/tests/Zend/Cloud/StorageService/FactoryTest.php index 1f1032342d..5841b1bb84 100644 --- a/tests/Zend/Cloud/StorageService/FactoryTest.php +++ b/tests/Zend/Cloud/StorageService/FactoryTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testGetStorageAdapterKey() @@ -131,6 +131,6 @@ public function testGetAdapterWithArray() } // Call Zend_Cloud_StorageService_FactoryTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Cloud_StorageService_FactoryTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Cloud_StorageService_FactoryTest::main") { Zend_Cloud_StorageService_FactoryTest::main(); } diff --git a/tests/Zend/Cloud/StorageService/TestCase.php b/tests/Zend/Cloud/StorageService/TestCase.php index 1c3b072589..9b89a167ae 100644 --- a/tests/Zend/Cloud/StorageService/TestCase.php +++ b/tests/Zend/Cloud/StorageService/TestCase.php @@ -1,6 +1,6 @@ _config = $this->_getConfig(); $this->_commonStorage = Zend_Cloud_StorageService_Factory::getAdapter($this->_config); diff --git a/tests/Zend/CodeGenerator/AllTests.php b/tests/Zend/CodeGenerator/AllTests.php index 8df86b5829..c1f324cf1e 100644 --- a/tests/Zend/CodeGenerator/AllTests.php +++ b/tests/Zend/CodeGenerator/AllTests.php @@ -42,7 +42,7 @@ class Zend_CodeGenerator_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_CodeGenerator_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_CodeGenerator_AllTests::main') { Zend_CodeGenerator_AllTests::main(); } diff --git a/tests/Zend/CodeGenerator/Php/AllTests.php b/tests/Zend/CodeGenerator/Php/AllTests.php index f63ccdfffe..dff5507376 100644 --- a/tests/Zend/CodeGenerator/Php/AllTests.php +++ b/tests/Zend/CodeGenerator/Php/AllTests.php @@ -52,7 +52,7 @@ class Zend_CodeGenerator_Php_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -74,6 +74,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_CodeGenerator_Php_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_CodeGenerator_Php_AllTests::main') { Zend_CodeGenerator_Php_AllTests::main(); } diff --git a/tests/Zend/CodeGenerator/Php/ClassTest.php b/tests/Zend/CodeGenerator/Php/ClassTest.php index 8bcda22f31..b2d22e44e7 100644 --- a/tests/Zend/CodeGenerator/Php/ClassTest.php +++ b/tests/Zend/CodeGenerator/Php/ClassTest.php @@ -1,6 +1,6 @@ _tag = new Zend_CodeGenerator_Php_Docblock_Tag_Param(); } - protected function tearDown(): void + protected function tear_down() { $this->_tag = null; } diff --git a/tests/Zend/CodeGenerator/Php/Docblock/Tag/ReturnTest.php b/tests/Zend/CodeGenerator/Php/Docblock/Tag/ReturnTest.php index f8c2c39cfa..9867ca60ad 100644 --- a/tests/Zend/CodeGenerator/Php/Docblock/Tag/ReturnTest.php +++ b/tests/Zend/CodeGenerator/Php/Docblock/Tag/ReturnTest.php @@ -1,6 +1,6 @@ _tag = new Zend_CodeGenerator_Php_Docblock_Tag_Return(); } - protected function tearDown(): void + protected function tear_down() { $this->_tag = null; } diff --git a/tests/Zend/CodeGenerator/Php/Docblock/TagTest.php b/tests/Zend/CodeGenerator/Php/Docblock/TagTest.php index f7c30d5654..6c4af09604 100644 --- a/tests/Zend/CodeGenerator/Php/Docblock/TagTest.php +++ b/tests/Zend/CodeGenerator/Php/Docblock/TagTest.php @@ -1,6 +1,6 @@ _tag = new Zend_CodeGenerator_Php_Docblock_Tag(); } - protected function tearDown(): void + protected function tear_down() { $this->_tag = null; } diff --git a/tests/Zend/CodeGenerator/Php/DocblockTest.php b/tests/Zend/CodeGenerator/Php/DocblockTest.php index 3dcf4f33d9..192b4dce55 100644 --- a/tests/Zend/CodeGenerator/Php/DocblockTest.php +++ b/tests/Zend/CodeGenerator/Php/DocblockTest.php @@ -1,6 +1,6 @@ _docblock = new Zend_CodeGenerator_Php_Docblock(); } - protected function tearDown(): void + protected function tear_down() { $this->_docblock = null; } diff --git a/tests/Zend/CodeGenerator/Php/FileTest.php b/tests/Zend/CodeGenerator/Php/FileTest.php index 91fc6ed59d..9bd9ca6f18 100644 --- a/tests/Zend/CodeGenerator/Php/FileTest.php +++ b/tests/Zend/CodeGenerator/Php/FileTest.php @@ -1,6 +1,6 @@ _method = new Zend_CodeGenerator_Php_Method(); } - protected function tearDown(): void + protected function tear_down() { $this->_method = null; } diff --git a/tests/Zend/CodeGenerator/Php/ParameterTest.php b/tests/Zend/CodeGenerator/Php/ParameterTest.php index b300dddef1..2d77e25139 100644 --- a/tests/Zend/CodeGenerator/Php/ParameterTest.php +++ b/tests/Zend/CodeGenerator/Php/ParameterTest.php @@ -1,6 +1,6 @@ _parameter = new Zend_CodeGenerator_Php_Parameter(); } - protected function tearDown(): void + protected function tear_down() { $this->_parameter = null; } diff --git a/tests/Zend/CodeGenerator/Php/Property/DefaultValueTest.php b/tests/Zend/CodeGenerator/Php/Property/DefaultValueTest.php index 414b1c7577..e5ab64e2f3 100644 --- a/tests/Zend/CodeGenerator/Php/Property/DefaultValueTest.php +++ b/tests/Zend/CodeGenerator/Php/Property/DefaultValueTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -64,6 +64,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Config_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Config_AllTests::main') { Zend_Config_AllTests::main(); } diff --git a/tests/Zend/Config/IniTest.php b/tests/Zend/Config/IniTest.php index 7eeda1cdb6..d27b9924c6 100644 --- a/tests/Zend/Config/IniTest.php +++ b/tests/Zend/Config/IniTest.php @@ -1,6 +1,6 @@ _iniFileConfig = dirname(__FILE__) . '/_files/config.ini'; $this->_iniFileAllSectionsConfig = dirname(__FILE__) . '/_files/allsections.ini'; diff --git a/tests/Zend/Config/JsonTest.php b/tests/Zend/Config/JsonTest.php index c906c237cf..60d0b99c15 100644 --- a/tests/Zend/Config/JsonTest.php +++ b/tests/Zend/Config/JsonTest.php @@ -1,6 +1,6 @@ _iniFileConfig = dirname(__FILE__) . '/_files/config.json'; $this->_iniFileAllSectionsConfig = dirname(__FILE__) . '/_files/allsections.json'; diff --git a/tests/Zend/Config/Writer/AllTests.php b/tests/Zend/Config/Writer/AllTests.php index 77f8ff7b00..a7a2bbfc23 100644 --- a/tests/Zend/Config/Writer/AllTests.php +++ b/tests/Zend/Config/Writer/AllTests.php @@ -46,7 +46,7 @@ class Zend_Config_Writer_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -63,6 +63,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Config_Writer_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Config_Writer_AllTests::main') { Zend_Config_Writer_AllTests::main(); } diff --git a/tests/Zend/Config/Writer/ArrayTest.php b/tests/Zend/Config/Writer/ArrayTest.php index 8cc7aa036b..0701a5ccd2 100644 --- a/tests/Zend/Config/Writer/ArrayTest.php +++ b/tests/Zend/Config/Writer/ArrayTest.php @@ -1,6 +1,6 @@ _tempName = tempnam(dirname(__FILE__) . '/temp', 'tmp'); } - protected function tearDown(): void + protected function tear_down() { @unlink($this->_tempName); } diff --git a/tests/Zend/Config/Writer/IniTest.php b/tests/Zend/Config/Writer/IniTest.php index 3c2c427776..2560ed13f2 100644 --- a/tests/Zend/Config/Writer/IniTest.php +++ b/tests/Zend/Config/Writer/IniTest.php @@ -1,6 +1,6 @@ _tempName = tempnam(dirname(__FILE__) . '/temp', 'tmp'); } - protected function tearDown(): void + protected function tear_down() { @unlink($this->_tempName); } diff --git a/tests/Zend/Config/Writer/JsonTest.php b/tests/Zend/Config/Writer/JsonTest.php index fe1012b8b8..a7aa0832b9 100644 --- a/tests/Zend/Config/Writer/JsonTest.php +++ b/tests/Zend/Config/Writer/JsonTest.php @@ -1,6 +1,6 @@ _tempName = tempnam(dirname(__FILE__) . '/temp', 'tmp'); } - protected function tearDown(): void + protected function tear_down() { @unlink($this->_tempName); } diff --git a/tests/Zend/Config/Writer/XmlTest.php b/tests/Zend/Config/Writer/XmlTest.php index d610004040..98a7012fa7 100644 --- a/tests/Zend/Config/Writer/XmlTest.php +++ b/tests/Zend/Config/Writer/XmlTest.php @@ -1,6 +1,6 @@ _tempName = tempnam(dirname(__FILE__) . '/temp', 'tmp'); } - protected function tearDown(): void + protected function tear_down() { @unlink($this->_tempName); } diff --git a/tests/Zend/Config/Writer/YamlTest.php b/tests/Zend/Config/Writer/YamlTest.php index 999e8a88b7..405fb0b416 100644 --- a/tests/Zend/Config/Writer/YamlTest.php +++ b/tests/Zend/Config/Writer/YamlTest.php @@ -1,6 +1,6 @@ _tempName = tempnam(dirname(__FILE__) . '/temp', 'tmp'); } - protected function tearDown(): void + protected function tear_down() { @unlink($this->_tempName); } diff --git a/tests/Zend/Config/XmlTest.php b/tests/Zend/Config/XmlTest.php index 110a989ff0..45e47dbab4 100644 --- a/tests/Zend/Config/XmlTest.php +++ b/tests/Zend/Config/XmlTest.php @@ -1,6 +1,6 @@ _xmlFileConfig = dirname(__FILE__) . '/_files/config.xml'; $this->_xmlFileAllSectionsConfig = dirname(__FILE__) . '/_files/allsections.xml'; diff --git a/tests/Zend/Config/YamlTest.php b/tests/Zend/Config/YamlTest.php index c7a73c40c6..7f64935538 100755 --- a/tests/Zend/Config/YamlTest.php +++ b/tests/Zend/Config/YamlTest.php @@ -1,6 +1,6 @@ _iniFileConfig = dirname(__FILE__) . '/_files/config.yaml'; $this->_iniFileAllSectionsConfig = dirname(__FILE__) . '/_files/allsections.yaml'; diff --git a/tests/Zend/ConfigTest.php b/tests/Zend/ConfigTest.php index 6e5778fb9c..5f6f154cac 100644 --- a/tests/Zend/ConfigTest.php +++ b/tests/Zend/ConfigTest.php @@ -1,6 +1,6 @@ _all = [ diff --git a/tests/Zend/Console/AllTests.php b/tests/Zend/Console/AllTests.php index 7a2653f50d..1f718684bd 100644 --- a/tests/Zend/Console/AllTests.php +++ b/tests/Zend/Console/AllTests.php @@ -42,7 +42,7 @@ class Zend_Console_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Console_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Console_AllTests::main') { Zend_Console_AllTests::main(); } diff --git a/tests/Zend/Console/GetoptTest.php b/tests/Zend/Console/GetoptTest.php index 413cc1c89b..c6309f718c 100644 --- a/tests/Zend/Console/GetoptTest.php +++ b/tests/Zend/Console/GetoptTest.php @@ -1,6 +1,6 @@ markTestSkipped("Cannot Test Zend_Console_Getopt without 'register_argc_argv' ini option true."); diff --git a/tests/Zend/Controller/Action/Helper/ActionStackTest.php b/tests/Zend/Controller/Action/Helper/ActionStackTest.php index a361238142..9de79c4ee2 100644 --- a/tests/Zend/Controller/Action/Helper/ActionStackTest.php +++ b/tests/Zend/Controller/Action/Helper/ActionStackTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -77,7 +77,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->front = Zend_Controller_Front::getInstance(); $this->front->resetInstance(); @@ -92,7 +92,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -200,6 +200,6 @@ public function testCannotStackActionIfNoRequestAvailable() } // Call Zend_Controller_Action_Helper_ActionStackTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_ActionStackTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_Helper_ActionStackTest::main") { Zend_Controller_Action_Helper_ActionStackTest::main(); } diff --git a/tests/Zend/Controller/Action/Helper/AjaxContextTest.php b/tests/Zend/Controller/Action/Helper/AjaxContextTest.php index 9abfc84684..feaf06c3bf 100644 --- a/tests/Zend/Controller/Action/Helper/AjaxContextTest.php +++ b/tests/Zend/Controller/Action/Helper/AjaxContextTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -115,7 +115,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) { unset($_SERVER['HTTP_X_REQUESTED_WITH']); @@ -155,7 +155,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) { unset($_SERVER['HTTP_X_REQUESTED_WITH']); @@ -305,6 +305,6 @@ public static function resetMvcInstance() } // Call Zend_Controller_Action_Helper_AjaxContextTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_AjaxContextTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_Helper_AjaxContextTest::main") { Zend_Controller_Action_Helper_AjaxContextTest::main(); } diff --git a/tests/Zend/Controller/Action/Helper/AllTests.php b/tests/Zend/Controller/Action/Helper/AllTests.php index fef2db763f..59ccfb5dcb 100644 --- a/tests/Zend/Controller/Action/Helper/AllTests.php +++ b/tests/Zend/Controller/Action/Helper/AllTests.php @@ -53,7 +53,7 @@ class Zend_Controller_Action_Helper_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -80,6 +80,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Controller_Action_Helper_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Controller_Action_Helper_AllTests::main') { Zend_Controller_Action_Helper_AllTests::main(); } diff --git a/tests/Zend/Controller/Action/Helper/AutoCompleteTest.php b/tests/Zend/Controller/Action/Helper/AutoCompleteTest.php index e814ea968d..23daa45b21 100644 --- a/tests/Zend/Controller/Action/Helper/AutoCompleteTest.php +++ b/tests/Zend/Controller/Action/Helper/AutoCompleteTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -99,7 +99,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Controller_Action_Helper_AutoCompleteTest_LayoutOverride::resetMvcInstance(); Zend_Controller_Action_HelperBroker::resetHelpers(); @@ -121,7 +121,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -298,6 +298,6 @@ public static function resetMvcInstance() } // Call Zend_Controller_Action_Helper_AutoCompleteTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_AutoCompleteTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_Helper_AutoCompleteTest::main") { Zend_Controller_Action_Helper_AutoCompleteTest::main(); } diff --git a/tests/Zend/Controller/Action/Helper/CacheTest.php b/tests/Zend/Controller/Action/Helper/CacheTest.php index ec12358810..e59cd387ea 100644 --- a/tests/Zend/Controller/Action/Helper/CacheTest.php +++ b/tests/Zend/Controller/Action/Helper/CacheTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_requestUriOld = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null; @@ -57,7 +57,7 @@ protected function setUp(): void $this->front->setRequest($this->request); } - protected function tearDown(): void + protected function tear_down() { $_SERVER['REQUEST_URI'] = $this->_requestUriOld; } @@ -307,6 +307,6 @@ public function start() {} public function end() {$this->res = 'verified';} }**/ -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_CacheTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_Helper_CacheTest::main") { Zend_Controller_Action_Helper_CacheTest::main(); } diff --git a/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php b/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php index 91f822cd37..e0faf84a8b 100644 --- a/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php +++ b/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -116,7 +116,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Controller_Action_Helper_ContextSwitchTest_LayoutOverride::resetMvcInstance(); Zend_Controller_Action_HelperBroker::resetHelpers(); @@ -156,7 +156,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -1059,6 +1059,6 @@ public function render($name) } // Call Zend_Controller_Action_Helper_ContextSwitchTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_ContextSwitchTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_Helper_ContextSwitchTest::main") { Zend_Controller_Action_Helper_ContextSwitchTest::main(); } diff --git a/tests/Zend/Controller/Action/Helper/FlashMessengerTest.php b/tests/Zend/Controller/Action/Helper/FlashMessengerTest.php index 5703f06f8a..9628f32e39 100644 --- a/tests/Zend/Controller/Action/Helper/FlashMessengerTest.php +++ b/tests/Zend/Controller/Action/Helper/FlashMessengerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $savePath = ini_get('session.save_path'); if (strpos($savePath, ';')) { @@ -244,6 +244,6 @@ public function reset() } // Call Zend_Controller_Action_Helper_FlashMessengerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_FlashMessengerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_Helper_FlashMessengerTest::main") { Zend_Controller_Action_Helper_FlashMessengerTest::main(); } diff --git a/tests/Zend/Controller/Action/Helper/JsonTest.php b/tests/Zend/Controller/Action/Helper/JsonTest.php index 306fd0202c..3f6fc8fda4 100644 --- a/tests/Zend/Controller/Action/Helper/JsonTest.php +++ b/tests/Zend/Controller/Action/Helper/JsonTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -83,7 +83,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Controller_Action_Helper_JsonTest_Layout::resetMvcInstance(); @@ -106,7 +106,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -259,6 +259,6 @@ public static function resetMvcInstance() } // Call Zend_Controller_Action_Helper_JsonTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_JsonTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_Helper_JsonTest::main") { Zend_Controller_Action_Helper_JsonTest::main(); } diff --git a/tests/Zend/Controller/Action/Helper/NamespaceTest.php b/tests/Zend/Controller/Action/Helper/NamespaceTest.php index 724e5d13c4..1fdc346e04 100644 --- a/tests/Zend/Controller/Action/Helper/NamespaceTest.php +++ b/tests/Zend/Controller/Action/Helper/NamespaceTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,6 +73,6 @@ public function testGetNameWithNamespace() } // Call Zend_Controller_Action_Helper_NamespaceTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == 'Zend_Controller_Action_Helper_NamespaceTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Controller_Action_Helper_NamespaceTest::main') { Zend_Controller_Action_Helper_NamespaceTest::main(); } diff --git a/tests/Zend/Controller/Action/Helper/RedirectorTest.php b/tests/Zend/Controller/Action/Helper/RedirectorTest.php index 87c8c0f799..0f5bee4013 100644 --- a/tests/Zend/Controller/Action/Helper/RedirectorTest.php +++ b/tests/Zend/Controller/Action/Helper/RedirectorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -98,7 +98,7 @@ public static function main() * * Also resets the front controller instance. */ - protected function setUp(): void + protected function set_up() { $front = Zend_Controller_Front::getInstance(); $front->resetInstance(); @@ -128,7 +128,7 @@ protected function setUp(): void /** * Unset all properties */ - protected function tearDown(): void + protected function tear_down() { unset($this->redirector); unset($this->controller); @@ -607,6 +607,6 @@ class Zend_Controller_Action_Helper_Redirector_TestController extends Zend_Contr } // Call Zend_Controller_Action_Helper_RedirectorTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_RedirectorTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_Helper_RedirectorTest::main") { Zend_Controller_Action_Helper_RedirectorTest::main(); } diff --git a/tests/Zend/Controller/Action/Helper/UrlTest.php b/tests/Zend/Controller/Action/Helper/UrlTest.php index e302ebc4b3..bd03a342ec 100644 --- a/tests/Zend/Controller/Action/Helper/UrlTest.php +++ b/tests/Zend/Controller/Action/Helper/UrlTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -76,7 +76,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->front = Zend_Controller_Front::getInstance(); $this->front->resetInstance(); @@ -90,7 +90,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -195,6 +195,6 @@ public function testBaseUrlIsAssembledIntoUrl() } // Call Zend_Controller_Action_Helper_UrlTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_UrlTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_Helper_UrlTest::main") { Zend_Controller_Action_Helper_UrlTest::main(); } diff --git a/tests/Zend/Controller/Action/Helper/ViewRendererTest.php b/tests/Zend/Controller/Action/Helper/ViewRendererTest.php index 5a8afed8a2..e37e08d05d 100644 --- a/tests/Zend/Controller/Action/Helper/ViewRendererTest.php +++ b/tests/Zend/Controller/Action/Helper/ViewRendererTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -102,7 +102,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->basePath = realpath(dirname(__FILE__) . str_repeat(DIRECTORY_SEPARATOR . '..', 2)); $this->request = new Zend_Controller_Request_Http(); @@ -123,7 +123,7 @@ protected function setUp(): void * * @access protected */ - protected function tearDown(): void + protected function tear_down() { Zend_Controller_Action_HelperBroker::resetHelpers(); } @@ -989,6 +989,6 @@ public function testActionsWithLeadingCapitalLettersShouldNotInvokeTruncatedView } // Call Zend_Controller_Action_Helper_ViewRendererTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_ViewRendererTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_Helper_ViewRendererTest::main") { Zend_Controller_Action_Helper_ViewRendererTest::main(); } diff --git a/tests/Zend/Controller/Action/HelperBroker/PriorityStackTest.php b/tests/Zend/Controller/Action/HelperBroker/PriorityStackTest.php index 1012bfdfa8..643816e1be 100644 --- a/tests/Zend/Controller/Action/HelperBroker/PriorityStackTest.php +++ b/tests/Zend/Controller/Action/HelperBroker/PriorityStackTest.php @@ -1,6 +1,6 @@ stack = new Zend_Controller_Action_HelperBroker_PriorityStack(); } diff --git a/tests/Zend/Controller/Action/HelperBrokerTest.php b/tests/Zend/Controller/Action/HelperBrokerTest.php index 2b1e0a611f..0fd7c500ce 100644 --- a/tests/Zend/Controller/Action/HelperBrokerTest.php +++ b/tests/Zend/Controller/Action/HelperBrokerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->front = Zend_Controller_Front::getInstance(); $this->front->resetInstance(); @@ -386,6 +386,6 @@ public function test() } // Call Zend_Controller_Action_HelperBrokerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_HelperBrokerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Action_HelperBrokerTest::main") { Zend_Controller_Action_HelperBrokerTest::main(); } diff --git a/tests/Zend/Controller/ActionTest.php b/tests/Zend/Controller/ActionTest.php index 590227f832..4d8ddbe3ed 100644 --- a/tests/Zend/Controller/ActionTest.php +++ b/tests/Zend/Controller/ActionTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { Zend_Controller_Action_HelperBroker::resetHelpers(); $front = Zend_Controller_Front::getInstance(); @@ -85,7 +85,7 @@ protected function setUp(): void $redirector->setExit(false); } - protected function tearDown(): void + protected function tear_down() { unset($this->_controller); } @@ -560,6 +560,6 @@ public function bar() } // Call Zend_Controller_ActionTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_ActionTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_ActionTest::main") { Zend_Controller_ActionTest::main(); } diff --git a/tests/Zend/Controller/AllTests.php b/tests/Zend/Controller/AllTests.php index 769a8bcd32..782d9162f4 100644 --- a/tests/Zend/Controller/AllTests.php +++ b/tests/Zend/Controller/AllTests.php @@ -63,7 +63,7 @@ class Zend_Controller_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -97,6 +97,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Controller_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Controller_AllTests::main') { Zend_Controller_AllTests::main(); } diff --git a/tests/Zend/Controller/Dispatcher/StandardTest.php b/tests/Zend/Controller/Dispatcher/StandardTest.php index 588ad0ddbd..a2cb13a9f0 100644 --- a/tests/Zend/Controller/Dispatcher/StandardTest.php +++ b/tests/Zend/Controller/Dispatcher/StandardTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (isset($this->error)) { unset($this->error); @@ -79,7 +79,7 @@ protected function setUp(): void ]); } - protected function tearDown(): void + protected function tear_down() { unset($this->_dispatcher); } @@ -718,6 +718,6 @@ public function testGetControllerClassThrowsExceptionIfNoDefaultModuleDefined() } // Call Zend_Controller_Dispatcher_StandardTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Dispatcher_StandardTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Dispatcher_StandardTest::main") { Zend_Controller_Dispatcher_StandardTest::main(); } diff --git a/tests/Zend/Controller/FrontTest.php b/tests/Zend/Controller/FrontTest.php index 022f562196..eceeb7861e 100644 --- a/tests/Zend/Controller/FrontTest.php +++ b/tests/Zend/Controller/FrontTest.php @@ -1,7 +1,7 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_controller = Zend_Controller_Front::getInstance(); $this->_controller->resetInstance(); @@ -86,7 +86,7 @@ protected function setUp(): void Zend_Controller_Action_HelperBroker::resetHelpers(); } - protected function tearDown(): void + protected function tear_down() { unset($this->_controller); } @@ -820,6 +820,6 @@ public function testDispatcherCatchesTypeExceptionFromPlugin() } // Call Zend_Controller_FrontTest::main() if this source file is executed directly. -// if (PHPUnit_MAIN_METHOD == "Zend_Controller_FrontTest::main") { +// if (PHPUnit_MAIN_METHOD === "Zend_Controller_FrontTest::main") { // Zend_Controller_FrontTest::main(); // } diff --git a/tests/Zend/Controller/Plugin/ActionStackTest.php b/tests/Zend/Controller/Plugin/ActionStackTest.php index b1208eeac0..f9cbde89f1 100644 --- a/tests/Zend/Controller/Plugin/ActionStackTest.php +++ b/tests/Zend/Controller/Plugin/ActionStackTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -69,7 +69,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->removeRegistryEntry(); $this->registry = Zend_Registry::getInstance(); @@ -81,7 +81,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { $this->removeRegistryEntry(); } @@ -399,6 +399,6 @@ class Zend_Controller_Plugin_ActionStack_Registry extends Zend_Registry } // Call Zend_Controller_Plugin_ActionStackTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Plugin_ActionStackTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Plugin_ActionStackTest::main") { Zend_Controller_Plugin_ActionStackTest::main(); } diff --git a/tests/Zend/Controller/Plugin/BrokerTest.php b/tests/Zend/Controller/Plugin/BrokerTest.php index d9a5573763..b9ff9be8b0 100644 --- a/tests/Zend/Controller/Plugin/BrokerTest.php +++ b/tests/Zend/Controller/Plugin/BrokerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->controller = Zend_Controller_Front::getInstance(); $this->controller->resetInstance(); @@ -349,6 +349,6 @@ public function dispatchLoopShutdown() // Call Zend_Controller_Plugin_BrokerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Plugin_BrokerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Plugin_BrokerTest::main") { Zend_Controller_Plugin_BrokerTest::main(); } diff --git a/tests/Zend/Controller/Plugin/ErrorHandlerTest.php b/tests/Zend/Controller/Plugin/ErrorHandlerTest.php index 077b8305a3..ab5ae34b1d 100644 --- a/tests/Zend/Controller/Plugin/ErrorHandlerTest.php +++ b/tests/Zend/Controller/Plugin/ErrorHandlerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -96,7 +96,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { Zend_Controller_Front::getInstance()->resetInstance(); $this->request = new Zend_Controller_Request_Http(); @@ -113,7 +113,7 @@ protected function setUp(): void * * @access protected */ - protected function tearDown(): void + protected function tear_down() { } @@ -282,6 +282,6 @@ public function testPostDispatchQuitsWithFalseUserErrorHandlerParam() } // Call Zend_Controller_Plugin_ErrorHandlerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Plugin_ErrorHandlerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Plugin_ErrorHandlerTest::main") { Zend_Controller_Plugin_ErrorHandlerTest::main(); } diff --git a/tests/Zend/Controller/Plugin/PutHandlerTest.php b/tests/Zend/Controller/Plugin/PutHandlerTest.php index c1b1243250..559be09287 100644 --- a/tests/Zend/Controller/Plugin/PutHandlerTest.php +++ b/tests/Zend/Controller/Plugin/PutHandlerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -78,7 +78,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { Zend_Controller_Front::getInstance()->resetInstance(); $this->request = new Zend_Controller_Request_HttpTestCase(); @@ -99,6 +99,6 @@ public function test_marshall_PUT_body_as_params() } // Call Zend_Controller_Plugin_PutHandlerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Plugin_PutHandlerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Plugin_PutHandlerTest::main") { Zend_Controller_Plugin_PutHandlerTest::main(); } diff --git a/tests/Zend/Controller/Request/Apache404Test.php b/tests/Zend/Controller/Request/Apache404Test.php index f380b73703..efd592b14c 100644 --- a/tests/Zend/Controller/Request/Apache404Test.php +++ b/tests/Zend/Controller/Request/Apache404Test.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_server = $_SERVER; } - protected function tearDown(): void + protected function tear_down() { $_SERVER = $this->_server; } @@ -103,6 +103,6 @@ public function testRedirectQueryStringShouldBeParsedIntoGetVars() } // Call Zend_Controller_Request_Apache404Test::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Request_Apache404Test::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Request_Apache404Test::main") { Zend_Controller_Request_Apache404Test::main(); } diff --git a/tests/Zend/Controller/Request/HttpTest.php b/tests/Zend/Controller/Request/HttpTest.php index 8ed7eb2e1d..9134cd3690 100644 --- a/tests/Zend/Controller/Request/HttpTest.php +++ b/tests/Zend/Controller/Request/HttpTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_origServer = $_SERVER; $_GET = []; @@ -79,7 +79,7 @@ protected function setUp(): void $this->_request = new Zend_Controller_Request_Http('http://framework.zend.com/news/3?var1=val1&var2=val2#anchor'); } - protected function tearDown(): void + protected function tear_down() { unset($this->_request); $_SERVER = $this->_origServer; @@ -984,6 +984,6 @@ public function testHostNameShouldBeEmpty() } // Call Zend_Controller_Request_HttpTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Request_HttpTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Request_HttpTest::main") { Zend_Controller_Request_HttpTest::main(); } diff --git a/tests/Zend/Controller/Request/HttpTestCaseTest.php b/tests/Zend/Controller/Request/HttpTestCaseTest.php index bd8c755ed2..d1504728dd 100644 --- a/tests/Zend/Controller/Request/HttpTestCaseTest.php +++ b/tests/Zend/Controller/Request/HttpTestCaseTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->request = new Zend_Controller_Request_HttpTestCase(); $_GET = []; @@ -82,7 +82,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -323,6 +323,6 @@ public function testShouldAllowSpecifyingRequestMethod() } // Call Zend_Controller_Request_HttpTestCaseTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Request_HttpTestCaseTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Request_HttpTestCaseTest::main") { Zend_Controller_Request_HttpTestCaseTest::main(); } diff --git a/tests/Zend/Controller/Request/SimpleTest.php b/tests/Zend/Controller/Request/SimpleTest.php index dd6862ae97..c0edaed1b9 100644 --- a/tests/Zend/Controller/Request/SimpleTest.php +++ b/tests/Zend/Controller/Request/SimpleTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testSimpleRequestIsOfAbstractRequestType() @@ -88,6 +88,6 @@ public function testSettingParamToNullInSetparamsCorrectlyUnsetsValue() } // Call Zend_Controller_Request_SimpleTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Request_SimpleTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Request_SimpleTest::main") { Zend_Controller_Request_SimpleTest::main(); } diff --git a/tests/Zend/Controller/Response/HttpTest.php b/tests/Zend/Controller/Response/HttpTest.php index 6445d11b4f..8c4fb63220 100644 --- a/tests/Zend/Controller/Response/HttpTest.php +++ b/tests/Zend/Controller/Response/HttpTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_response = new Zend_Controller_Response_Http(); $this->_response->headersSentThrowsException = false; } - protected function tearDown(): void + protected function tear_down() { unset($this->_response); } @@ -656,6 +656,6 @@ class Zend_Controller_Response_HttpTest_Action extends Zend_Controller_Action } // Call Zend_Controller_Response_HttpTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Response_HttpTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Response_HttpTest::main") { Zend_Controller_Response_HttpTest::main(); } diff --git a/tests/Zend/Controller/Response/HttpTestCaseTest.php b/tests/Zend/Controller/Response/HttpTestCaseTest.php index 0ce318ab02..9c90822e53 100644 --- a/tests/Zend/Controller/Response/HttpTestCaseTest.php +++ b/tests/Zend/Controller/Response/HttpTestCaseTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->response = new Zend_Controller_Response_HttpTestCase(); } @@ -79,7 +79,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -136,6 +136,6 @@ public function testCanSendHeadersShouldAlwaysReturnTrue() } // Call Zend_Controller_Response_HttpTestCaseTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Response_HttpTestCaseTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Response_HttpTestCaseTest::main") { Zend_Controller_Response_HttpTestCaseTest::main(); } diff --git a/tests/Zend/Controller/Router/RewriteTest.php b/tests/Zend/Controller/Router/RewriteTest.php index d443eb9460..2ed8da5447 100644 --- a/tests/Zend/Controller/Router/RewriteTest.php +++ b/tests/Zend/Controller/Router/RewriteTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_router = new Zend_Controller_Router_Rewrite(); $front = Zend_Controller_Front::getInstance(); @@ -89,7 +89,7 @@ protected function setUp(): void $this->_router->setFrontController($front); } - protected function tearDown(): void + protected function tear_down() { unset($this->_router); } @@ -896,6 +896,6 @@ public function getRequest() } } -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Router_RewriteTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Router_RewriteTest::main") { Zend_Controller_Router_RewriteTest::main(); } diff --git a/tests/Zend/Controller/Router/Route/ChainTest.php b/tests/Zend/Controller/Router/Route/ChainTest.php index cca575a5d8..21440d062e 100644 --- a/tests/Zend/Controller/Router/Route/ChainTest.php +++ b/tests/Zend/Controller/Router/Route/ChainTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testChaining() @@ -1121,6 +1121,6 @@ public function getDefaultAction() } } -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Router_Route_ChainTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Router_Route_ChainTest::main") { Zend_Controller_Router_Route_ChainTest::main(); } diff --git a/tests/Zend/Controller/Router/Route/HostnameTest.php b/tests/Zend/Controller/Router/Route/HostnameTest.php index a6e04814db..8d7efd0943 100644 --- a/tests/Zend/Controller/Router/Route/HostnameTest.php +++ b/tests/Zend/Controller/Router/Route/HostnameTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testCorrectStaticHostMatch() @@ -276,6 +276,6 @@ public function getScheme() } } -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Router_Route_HostnameTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Router_Route_HostnameTest::main") { Zend_Controller_Router_Route_HostnameTest::main(); } diff --git a/tests/Zend/Controller/Router/Route/ModuleTest.php b/tests/Zend/Controller/Router/Route/ModuleTest.php index 93fb0215e2..d55fe897b0 100644 --- a/tests/Zend/Controller/Router/Route/ModuleTest.php +++ b/tests/Zend/Controller/Router/Route/ModuleTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $front = Zend_Controller_Front::getInstance(); $front->resetInstance(); @@ -488,6 +488,6 @@ public function testAssembleShouldUrlEncodeAllParameterNames() } // Call Zend_Controller_Router_Route_ModuleTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Controller_Router_Route_ModuleTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Controller_Router_Route_ModuleTest::main") { Zend_Controller_Router_Route_ModuleTest::main(); } diff --git a/tests/Zend/Controller/Router/Route/RegexTest.php b/tests/Zend/Controller/Router/Route/RegexTest.php index fafde8c595..3e0b098196 100644 --- a/tests/Zend/Controller/Router/Route/RegexTest.php +++ b/tests/Zend/Controller/Router/Route/RegexTest.php @@ -1,6 +1,6 @@ _server = $_SERVER; @@ -84,7 +84,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { // Restore server array $_SERVER = $this->_server; @@ -805,6 +805,6 @@ public function testEscapedSpecialCharsWithTranslation() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Controller_Router_RouteTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Controller_Router_RouteTests::main') { Zend_Controller_Router_RouteTests::main(); } diff --git a/tests/Zend/Crypt/AllTests.php b/tests/Zend/Crypt/AllTests.php index 4985d9fd28..105ab6b4af 100644 --- a/tests/Zend/Crypt/AllTests.php +++ b/tests/Zend/Crypt/AllTests.php @@ -46,7 +46,7 @@ class Zend_Crypt_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -63,6 +63,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Crypt_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Crypt_AllTests::main') { Zend_Crypt_AllTests::main(); } diff --git a/tests/Zend/Crypt/DiffieHellmanTest.php b/tests/Zend/Crypt/DiffieHellmanTest.php index e882627083..2fb9870df6 100644 --- a/tests/Zend/Crypt/DiffieHellmanTest.php +++ b/tests/Zend/Crypt/DiffieHellmanTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Crypt_Math_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Crypt_Math_AllTests::main') { Zend_Crypt_Math_AllTests::main(); } diff --git a/tests/Zend/Crypt/Math/BigInteger/BcmathTest.php b/tests/Zend/Crypt/Math/BigInteger/BcmathTest.php index 0f9f2b1f2b..bf27c14472 100644 --- a/tests/Zend/Crypt/Math/BigInteger/BcmathTest.php +++ b/tests/Zend/Crypt/Math/BigInteger/BcmathTest.php @@ -1,6 +1,6 @@ markTestSkipped('Skipped: Zend_Crypt_Math_BigInteger_BcmathTest due to ext/bcmath being unavailable'); diff --git a/tests/Zend/Crypt/Math/BigInteger/GmpTest.php b/tests/Zend/Crypt/Math/BigInteger/GmpTest.php index b73f4dabfe..3c66ce9c90 100644 --- a/tests/Zend/Crypt/Math/BigInteger/GmpTest.php +++ b/tests/Zend/Crypt/Math/BigInteger/GmpTest.php @@ -1,6 +1,6 @@ markTestSkipped('Skipped: Zend_Crypt_Math_BigInteger_GmpTest due to ext/gmp being unavailable'); diff --git a/tests/Zend/Crypt/MathTest.php b/tests/Zend/Crypt/MathTest.php index ec411ceb43..0eb4e3bc79 100644 --- a/tests/Zend/Crypt/MathTest.php +++ b/tests/Zend/Crypt/MathTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Crypt_Rsa_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Crypt_Rsa_AllTests::main') { Zend_Crypt_Rsa_AllTests::main(); } diff --git a/tests/Zend/Crypt/Rsa/RsaTest.php b/tests/Zend/Crypt/Rsa/RsaTest.php index 43afe43de8..7822d7ede1 100644 --- a/tests/Zend/Crypt/Rsa/RsaTest.php +++ b/tests/Zend/Crypt/Rsa/RsaTest.php @@ -1,6 +1,6 @@ markTestSkipped('Zend_Crypt_Rsa requires openssl extension to be loaded.'); diff --git a/tests/Zend/CurrencyTest.php b/tests/Zend/CurrencyTest.php index 78f249896e..428b2f1d06 100644 --- a/tests/Zend/CurrencyTest.php +++ b/tests/Zend/CurrencyTest.php @@ -1,6 +1,6 @@ _cache = Zend_Cache::factory( @@ -57,7 +57,7 @@ protected function setUp(): void Zend_Currency::setCache($this->_cache); } - protected function tearDown(): void + protected function tear_down() { $this->_cache->clean(Zend_Cache::CLEANING_MODE_ALL); } diff --git a/tests/Zend/Date/AllTests.php b/tests/Zend/Date/AllTests.php index 69586c33a5..a23c206866 100644 --- a/tests/Zend/Date/AllTests.php +++ b/tests/Zend/Date/AllTests.php @@ -44,7 +44,7 @@ class Zend_Date_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Date_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Date_AllTests::main') { Zend_Date_AllTests::main(); } diff --git a/tests/Zend/Date/DateObjectTest.php b/tests/Zend/Date/DateObjectTest.php index 42a85cf142..4ddc23fe2c 100644 --- a/tests/Zend/Date/DateObjectTest.php +++ b/tests/Zend/Date/DateObjectTest.php @@ -1,6 +1,6 @@ originalTimezone = date_default_timezone_get(); date_default_timezone_set('Europe/Paris'); @@ -62,7 +62,7 @@ protected function setUp(): void Zend_Date_DateObjectTestHelper::setOptions(['cache' => $this->_cache]); } - protected function tearDown(): void + protected function tear_down() { date_default_timezone_set($this->originalTimezone); $this->_cache->clean(Zend_Cache::CLEANING_MODE_ALL); diff --git a/tests/Zend/DateTest.php b/tests/Zend/DateTest.php index f6baf4a86c..2731fbd92a 100644 --- a/tests/Zend/DateTest.php +++ b/tests/Zend/DateTest.php @@ -1,6 +1,6 @@ originalTimezone = date_default_timezone_get(); date_default_timezone_set('Indian/Maldives'); @@ -85,7 +85,7 @@ protected function setUp(): void Zend_Date::setOptions(['format_type' => 'iso']); } - protected function tearDown(): void + protected function tear_down() { Zend_Date::setOptions($this->_orig); $this->_cache->clean(Zend_Cache::CLEANING_MODE_ALL); diff --git a/tests/Zend/Db/Adapter/Pdo/SqliteTest.php b/tests/Zend/Db/Adapter/Pdo/SqliteTest.php index 06d4784a15..ba91a532c4 100644 --- a/tests/Zend/Db/Adapter/Pdo/SqliteTest.php +++ b/tests/Zend/Db/Adapter/Pdo/SqliteTest.php @@ -116,7 +116,7 @@ public function testAdapterInsertSequence() protected function _testAdapterOptionCaseFoldingSetup(Zend_Db_Adapter_Abstract $db) { $db->getConnection(); - $this->_util->setUp($db); + $this->_util->set_up($db); } /** diff --git a/tests/Zend/Db/Adapter/SkipTests.php b/tests/Zend/Db/Adapter/SkipTests.php index aa90b85572..7b987a9d68 100644 --- a/tests/Zend/Db/Adapter/SkipTests.php +++ b/tests/Zend/Db/Adapter/SkipTests.php @@ -1,6 +1,6 @@ getDriver(); $this->markTestSkipped("Testing Zend_Db_Adapter_$driver is not enabled in TestConfiguration.php"); diff --git a/tests/Zend/Db/Adapter/StaticTest.php b/tests/Zend/Db/Adapter/StaticTest.php index 8c5b7e5ad8..c939668c8a 100644 --- a/tests/Zend/Db/Adapter/StaticTest.php +++ b/tests/Zend/Db/Adapter/StaticTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -167,6 +167,6 @@ protected static function _skipTestSuite($driver, $message = '') } } -if (PHPUnit_MAIN_METHOD == 'Zend_Db_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Db_AllTests::main') { Zend_Db_AllTests::main(); } diff --git a/tests/Zend/Db/Profiler/AllTests.php b/tests/Zend/Db/Profiler/AllTests.php index bff8efdb2a..821f64d219 100644 --- a/tests/Zend/Db/Profiler/AllTests.php +++ b/tests/Zend/Db/Profiler/AllTests.php @@ -43,7 +43,7 @@ class Zend_Db_Profiler_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -56,6 +56,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Db_Profiler_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Db_Profiler_AllTests::main') { Zend_Db_Profiler_AllTests::main(); } diff --git a/tests/Zend/Db/Profiler/FirebugTest.php b/tests/Zend/Db/Profiler/FirebugTest.php index 544c2ff681..3687544a0a 100644 --- a/tests/Zend/Db/Profiler/FirebugTest.php +++ b/tests/Zend/Db/Profiler/FirebugTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!extension_loaded('pdo_sqlite')) { $this->markTestSkipped('Requires PDO_Sqlite extension'); @@ -100,7 +100,7 @@ protected function setUp(): void )'); } - protected function tearDown(): void + protected function tear_down() { if (extension_loaded('pdo_sqlite')) { $this->_db->getConnection()->exec('DROP TABLE foo'); diff --git a/tests/Zend/Db/Profiler/TestCommon.php b/tests/Zend/Db/Profiler/TestCommon.php index 44e1961358..87946c6c24 100644 --- a/tests/Zend/Db/Profiler/TestCommon.php +++ b/tests/Zend/Db/Profiler/TestCommon.php @@ -41,18 +41,18 @@ */ abstract class Zend_Db_Profiler_TestCommon extends Zend_Db_TestSetup { - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); $this->_db->getProfiler()->setEnabled(true); } - protected function tearDown(): void + protected function tear_down() { if ($this->_db instanceof Zend_Db_Adapter_Abstract) { $this->_db->getProfiler()->setEnabled(false); } - parent::tearDown(); + parent::tear_down(); } public function testProfilerPreparedStatement() diff --git a/tests/Zend/Db/SkipTests.php b/tests/Zend/Db/SkipTests.php index 0a260c5249..bb01dceae6 100644 --- a/tests/Zend/Db/SkipTests.php +++ b/tests/Zend/Db/SkipTests.php @@ -1,6 +1,6 @@ getDriver(); $message = 'Skipping ' . $this->getDriver(); diff --git a/tests/Zend/Db/Statement/StaticTest.php b/tests/Zend/Db/Statement/StaticTest.php index 9e4fab2d68..cf28ed728f 100644 --- a/tests/Zend/Db/Statement/StaticTest.php +++ b/tests/Zend/Db/Statement/StaticTest.php @@ -1,6 +1,6 @@ _table['accounts'] = $this->_getTable('My_ZendDbTable_TableAccounts'); $this->_table['bugs'] = $this->_getTable('My_ZendDbTable_TableBugs'); @@ -56,12 +56,12 @@ protected function setUp(): void $this->_table['products'] = $this->_getTable('My_ZendDbTable_TableProducts'); } - protected function tearDown(): void + protected function tear_down() { if ($this->_runtimeIncludePath) { $this->_restoreIncludePath(); } - parent::tearDown(); + parent::tear_down(); } protected function _getTable($tableClass, $options = []) diff --git a/tests/Zend/Db/Table/StaticTest.php b/tests/Zend/Db/Table/StaticTest.php index c622c1efb2..9ceb3e0d10 100644 --- a/tests/Zend/Db/Table/StaticTest.php +++ b/tests/Zend/Db/Table/StaticTest.php @@ -1,6 +1,6 @@ expectNotice(); - $this->expectNoticeMessage('Failed saving metadata to metadataCache'); + $this->expectException(\PHPUnit\Framework\Error\Notice::class); + $this->expectExceptionMessage('Failed saving metadata to metadataCache'); $cache = $this->_getCacheNowrite(); Zend_Db_Table_Abstract::setDefaultMetadataCache($cache); $bugsTable = $this->_getTable('My_ZendDbTable_TableBugs'); @@ -1579,13 +1579,13 @@ public function testTableMetadataCacheNew() $this->assertFalse($tableBugsCustom1->isMetadataFromCache, 'Failed asserting metadata is not from cache'); - $tableBugsCustom1->setup(); + $tableBugsCustom1->set_up(); $this->assertTrue($tableBugsCustom1->isMetadataFromCache, 'Failed asserting metadata is from cache'); $cache->clean(Zend_Cache::CLEANING_MODE_ALL); - $tableBugsCustom1->setup(); + $tableBugsCustom1->set_up(); $this->assertFalse($tableBugsCustom1->isMetadataFromCache, 'Failed asserting metadata is not from cache after cleaning'); } @@ -1615,13 +1615,13 @@ public function testTableMetadataCacheInClass() $this->assertFalse($tableBugsCustom1->isMetadataFromCache, 'Failed asserting metadata is not from cache'); - $tableBugsCustom1->setup(); + $tableBugsCustom1->set_up(); $this->assertTrue($tableBugsCustom1->isMetadataFromCache, 'Failed asserting metadata is from cache'); $cache->clean(Zend_Cache::CLEANING_MODE_ALL); - $tableBugsCustom1->setup(); + $tableBugsCustom1->set_up(); $this->assertTrue($tableBugsCustom1->isMetadataFromCache, 'Failed asserting metadata is from cache after cleaning'); } @@ -1646,13 +1646,13 @@ public function testTableMetadataCacheClass() $tableBugsCustom1->getMetadataCache() instanceof Zend_Cache_Core ); - $tableBugsCustom1->setup(); + $tableBugsCustom1->set_up(); $this->assertTrue($tableBugsCustom1->isMetadataFromCache); $cache->clean(Zend_Cache::CLEANING_MODE_ALL); - $tableBugsCustom1->setup(); + $tableBugsCustom1->set_up(); $this->assertFalse($tableBugsCustom1->isMetadataFromCache); } diff --git a/tests/Zend/Db/Table/TestSetup.php b/tests/Zend/Db/Table/TestSetup.php index c05efa1761..0cf6efb524 100644 --- a/tests/Zend/Db/Table/TestSetup.php +++ b/tests/Zend/Db/Table/TestSetup.php @@ -48,9 +48,9 @@ abstract class Zend_Db_Table_TestSetup extends Zend_Db_TestSetup protected $_runtimeIncludePath = null; - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); $this->_table['accounts'] = $this->_getTable('My_ZendDbTable_TableAccounts'); $this->_table['bugs'] = $this->_getTable('My_ZendDbTable_TableBugs'); @@ -58,12 +58,12 @@ protected function setUp(): void $this->_table['products'] = $this->_getTable('My_ZendDbTable_TableProducts'); } - protected function tearDown(): void + protected function tear_down() { if ($this->_runtimeIncludePath) { $this->_restoreIncludePath(); } - parent::tearDown(); + parent::tear_down(); } protected function _getTable($tableClass, $options = []) diff --git a/tests/Zend/Db/Table/_files/My/ZendDbTable/TableBugsCustom.php b/tests/Zend/Db/Table/_files/My/ZendDbTable/TableBugsCustom.php index eb8b6ca181..55240f4332 100644 --- a/tests/Zend/Db/Table/_files/My/ZendDbTable/TableBugsCustom.php +++ b/tests/Zend/Db/Table/_files/My/ZendDbTable/TableBugsCustom.php @@ -76,7 +76,7 @@ class My_ZendDbTable_TableBugsCustom extends My_ZendDbTable_TableBugs * * @return void */ - public function setup() + public function set_up() { $this->_setup(); } diff --git a/tests/Zend/Db/TestSetup.php b/tests/Zend/Db/TestSetup.php index 1d2eefee00..94639c3b0f 100644 --- a/tests/Zend/Db/TestSetup.php +++ b/tests/Zend/Db/TestSetup.php @@ -1,6 +1,6 @@ _setUpTestUtil(); $this->_setUpAdapter(); - $this->_util->setUp($this->_db); + $this->_util->set_up($this->_db); } /** @@ -102,12 +102,12 @@ protected function _setUpAdapter() } /** - * Subclasses should call parent::tearDown() after + * Subclasses should call parent::tear_down() after * doing their own logic, e.g. deleting metadata. */ - protected function tearDown(): void + protected function tear_down() { - $this->_util->tearDown(); + $this->_util->tear_down(); $this->_db->closeConnection(); $this->_db = null; } diff --git a/tests/Zend/Db/TestUtil/Common.php b/tests/Zend/Db/TestUtil/Common.php index 8dea804596..e9ca07438a 100644 --- a/tests/Zend/Db/TestUtil/Common.php +++ b/tests/Zend/Db/TestUtil/Common.php @@ -488,7 +488,7 @@ public function dropView() } } - public function setUp(Zend_Db_Adapter_Abstract $db) + public function set_up(Zend_Db_Adapter_Abstract $db) { $this->setAdapter($db); @@ -530,7 +530,7 @@ protected function getAdapter() return $this->_db; } - public function tearDown() + public function tear_down() { $this->dropView(); $this->dropTable(); diff --git a/tests/Zend/Db/TestUtil/Db2.php b/tests/Zend/Db/TestUtil/Db2.php index d257b639f2..038982e360 100644 --- a/tests/Zend/Db/TestUtil/Db2.php +++ b/tests/Zend/Db/TestUtil/Db2.php @@ -34,11 +34,11 @@ */ class Zend_Db_TestUtil_Db2 extends Zend_Db_TestUtil_Common { - public function setUp(Zend_Db_Adapter_Abstract $db) + public function set_up(Zend_Db_Adapter_Abstract $db) { $this->setAdapter($db); $this->createSequence('zfproducts_seq'); - parent::setUp($db); + parent::set_up($db); } public function getParams(array $constants = []) diff --git a/tests/Zend/Db/TestUtil/Mysqli.php b/tests/Zend/Db/TestUtil/Mysqli.php index 78725423eb..91165597a9 100644 --- a/tests/Zend/Db/TestUtil/Mysqli.php +++ b/tests/Zend/Db/TestUtil/Mysqli.php @@ -118,18 +118,18 @@ protected function _getDataPrice() ]; } - public function setUp(Zend_Db_Adapter_Abstract $db) + public function set_up(Zend_Db_Adapter_Abstract $db) { - parent::setUp($db); + parent::set_up($db); $this->_createTestProcedure(); } - public function tearDown() + public function tear_down() { $this->_dropTestProcedure(); - parent::tearDown(); + parent::tear_down(); } protected function _createTestProcedure() diff --git a/tests/Zend/Db/TestUtil/Pdo/Oci.php b/tests/Zend/Db/TestUtil/Pdo/Oci.php index baa5159f39..89ae352178 100644 --- a/tests/Zend/Db/TestUtil/Pdo/Oci.php +++ b/tests/Zend/Db/TestUtil/Pdo/Oci.php @@ -37,12 +37,12 @@ */ class Zend_Db_TestUtil_Pdo_Oci extends Zend_Db_TestUtil_Pdo_Common { - public function setUp(Zend_Db_Adapter_Abstract $db) + public function set_up(Zend_Db_Adapter_Abstract $db) { $this->_db = $db; $this->createSequence('zfbugs_seq'); $this->createSequence('zfproducts_seq'); - parent::setUp($db); + parent::set_up($db); } public function getParams(array $constants = []) diff --git a/tests/Zend/Db/TestUtil/Pdo/Pgsql.php b/tests/Zend/Db/TestUtil/Pdo/Pgsql.php index 6a3a7ce55b..d42ddd81e5 100644 --- a/tests/Zend/Db/TestUtil/Pdo/Pgsql.php +++ b/tests/Zend/Db/TestUtil/Pdo/Pgsql.php @@ -37,11 +37,11 @@ */ class Zend_Db_TestUtil_Pdo_Pgsql extends Zend_Db_TestUtil_Pdo_Common { - public function setUp(Zend_Db_Adapter_Abstract $db) + public function set_up(Zend_Db_Adapter_Abstract $db) { $this->_db = $db; $this->createSequence('zfproducts_seq'); - parent::setUp($db); + parent::set_up($db); } public function getParams(array $constants = []) diff --git a/tests/Zend/DebugTest.php b/tests/Zend/DebugTest.php index a65c6d2654..ed9da7e1f4 100644 --- a/tests/Zend/DebugTest.php +++ b/tests/Zend/DebugTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -63,6 +63,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Dojo_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Dojo_AllTests::main') { Zend_Dojo_AllTests::main(); } diff --git a/tests/Zend/Dojo/BuildLayerTest.php b/tests/Zend/Dojo/BuildLayerTest.php index 40e5e95bca..e2254410de 100644 --- a/tests/Zend/Dojo/BuildLayerTest.php +++ b/tests/Zend/Dojo/BuildLayerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -61,13 +61,13 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); Zend_Dojo::enableView($this->view); } - protected function tearDown(): void + protected function tear_down() { unset($this->view); } @@ -380,6 +380,6 @@ protected function decodeProfileJson($profile) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Dojo_BuildLayerTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Dojo_BuildLayerTest::main') { Zend_Dojo_BuildLayerTest::main(); } diff --git a/tests/Zend/Dojo/DataTest.php b/tests/Zend/Dojo/DataTest.php index 25422a7ae0..dfeacc2fc7 100644 --- a/tests/Zend/Dojo/DataTest.php +++ b/tests/Zend/Dojo/DataTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -55,7 +55,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->dojoData = new Zend_Dojo_Data(); } @@ -584,6 +584,6 @@ public function valid() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Dojo_DataTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Dojo_DataTest::main') { Zend_Dojo_DataTest::main(); } diff --git a/tests/Zend/Dojo/DojoTest.php b/tests/Zend/Dojo/DojoTest.php index 2c5df2206f..e04b5207f8 100644 --- a/tests/Zend/Dojo/DojoTest.php +++ b/tests/Zend/Dojo/DojoTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { } @@ -84,7 +84,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -164,6 +164,6 @@ public function testEnableViewShouldSetAppropriateViewHelperPaths() } // Call Zend_Dojo_DojoTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_DojoTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_DojoTest::main") { Zend_Dojo_DojoTest::main(); } diff --git a/tests/Zend/Dojo/Form/AllTests.php b/tests/Zend/Dojo/Form/AllTests.php index 1db51addf1..4a700aba16 100644 --- a/tests/Zend/Dojo/Form/AllTests.php +++ b/tests/Zend/Dojo/Form/AllTests.php @@ -46,7 +46,7 @@ class Zend_Dojo_Form_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -62,6 +62,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Dojo_Form_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Dojo_Form_AllTests::main') { Zend_Dojo_Form_AllTests::main(); } diff --git a/tests/Zend/Dojo/Form/Decorator/AccordionContainerTest.php b/tests/Zend/Dojo/Form/Decorator/AccordionContainerTest.php index f2e613bc34..86f18010fe 100644 --- a/tests/Zend/Dojo/Form/Decorator/AccordionContainerTest.php +++ b/tests/Zend/Dojo/Form/Decorator/AccordionContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -87,7 +87,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -105,7 +105,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -146,6 +146,6 @@ public function testRenderingShouldCreateDijit() } // Call Zend_Dojo_Form_Decorator_AccordionContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Decorator_AccordionContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Decorator_AccordionContainerTest::main") { Zend_Dojo_Form_Decorator_AccordionContainerTest::main(); } diff --git a/tests/Zend/Dojo/Form/Decorator/AccordionPaneTest.php b/tests/Zend/Dojo/Form/Decorator/AccordionPaneTest.php index ccd35cbf0d..e565fd949c 100644 --- a/tests/Zend/Dojo/Form/Decorator/AccordionPaneTest.php +++ b/tests/Zend/Dojo/Form/Decorator/AccordionPaneTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -84,7 +84,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -102,7 +102,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -143,6 +143,6 @@ public function testRenderingShouldCreateDijit() } // Call Zend_Dojo_Form_Decorator_AccordionPaneTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Decorator_AccordionPaneTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Decorator_AccordionPaneTest::main") { Zend_Dojo_Form_Decorator_AccordionPaneTest::main(); } diff --git a/tests/Zend/Dojo/Form/Decorator/AllTests.php b/tests/Zend/Dojo/Form/Decorator/AllTests.php index 18b6ed434a..d21e0253da 100644 --- a/tests/Zend/Dojo/Form/Decorator/AllTests.php +++ b/tests/Zend/Dojo/Form/Decorator/AllTests.php @@ -51,7 +51,7 @@ class Zend_Dojo_Form_Decorator_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -72,6 +72,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Dojo_Form_Decorator_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Dojo_Form_Decorator_AllTests::main') { Zend_Dojo_Form_Decorator_AllTests::main(); } diff --git a/tests/Zend/Dojo/Form/Decorator/BorderContainerTest.php b/tests/Zend/Dojo/Form/Decorator/BorderContainerTest.php index e8528d06bd..32fb3f0873 100644 --- a/tests/Zend/Dojo/Form/Decorator/BorderContainerTest.php +++ b/tests/Zend/Dojo/Form/Decorator/BorderContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -87,7 +87,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -105,7 +105,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -146,6 +146,6 @@ public function testRenderingShouldCreateDijit() } // Call Zend_Dojo_Form_Decorator_BorderContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Decorator_BorderContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Decorator_BorderContainerTest::main") { Zend_Dojo_Form_Decorator_BorderContainerTest::main(); } diff --git a/tests/Zend/Dojo/Form/Decorator/DijitContainerTest.php b/tests/Zend/Dojo/Form/Decorator/DijitContainerTest.php index 3982c49078..514be3843a 100644 --- a/tests/Zend/Dojo/Form/Decorator/DijitContainerTest.php +++ b/tests/Zend/Dojo/Form/Decorator/DijitContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -95,7 +95,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -114,7 +114,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -268,6 +268,6 @@ class Zend_Dojo_Form_Decorator_DijitContainerTest_Example extends Zend_Dojo_Form } // Call Zend_Dojo_Form_Decorator_DijitContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Decorator_DijitContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Decorator_DijitContainerTest::main") { Zend_Dojo_Form_Decorator_DijitContainerTest::main(); } diff --git a/tests/Zend/Dojo/Form/Decorator/DijitElementTest.php b/tests/Zend/Dojo/Form/Decorator/DijitElementTest.php index bf1d3337ee..1223063b4a 100644 --- a/tests/Zend/Dojo/Form/Decorator/DijitElementTest.php +++ b/tests/Zend/Dojo/Form/Decorator/DijitElementTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -95,7 +95,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -114,7 +114,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -247,6 +247,6 @@ public function testRenderingShouldRenderRequiredFlagAlways() } // Call Zend_Dojo_Form_Decorator_DijitElementTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Decorator_DijitElementTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Decorator_DijitElementTest::main") { Zend_Dojo_Form_Decorator_DijitElementTest::main(); } diff --git a/tests/Zend/Dojo/Form/Decorator/DijitFormTest.php b/tests/Zend/Dojo/Form/Decorator/DijitFormTest.php index c88d634efb..fd6389f81e 100644 --- a/tests/Zend/Dojo/Form/Decorator/DijitFormTest.php +++ b/tests/Zend/Dojo/Form/Decorator/DijitFormTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -90,7 +90,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -108,7 +108,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -168,6 +168,6 @@ public function testRenderingShouldEnforceFormName() } // Call Zend_Dojo_Form_Decorator_DijitFormTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Decorator_DijitFormTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Decorator_DijitFormTest::main") { Zend_Dojo_Form_Decorator_DijitFormTest::main(); } diff --git a/tests/Zend/Dojo/Form/Decorator/SplitContainerTest.php b/tests/Zend/Dojo/Form/Decorator/SplitContainerTest.php index 057a428475..87a22a3a62 100644 --- a/tests/Zend/Dojo/Form/Decorator/SplitContainerTest.php +++ b/tests/Zend/Dojo/Form/Decorator/SplitContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -89,7 +89,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -107,7 +107,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -148,6 +148,6 @@ public function testRenderingShouldCreateDijit() } // Call Zend_Dojo_Form_Decorator_SplitContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Decorator_SplitContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Decorator_SplitContainerTest::main") { Zend_Dojo_Form_Decorator_SplitContainerTest::main(); } diff --git a/tests/Zend/Dojo/Form/Decorator/StackContainerTest.php b/tests/Zend/Dojo/Form/Decorator/StackContainerTest.php index e494ad1efa..ef2b91fb8e 100644 --- a/tests/Zend/Dojo/Form/Decorator/StackContainerTest.php +++ b/tests/Zend/Dojo/Form/Decorator/StackContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -90,7 +90,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -108,7 +108,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -149,6 +149,6 @@ public function testRenderingShouldCreateDijit() } // Call Zend_Dojo_Form_Decorator_StackContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Decorator_StackContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Decorator_StackContainerTest::main") { Zend_Dojo_Form_Decorator_StackContainerTest::main(); } diff --git a/tests/Zend/Dojo/Form/Decorator/TabContainerTest.php b/tests/Zend/Dojo/Form/Decorator/TabContainerTest.php index be496d6b74..358ce4d80b 100644 --- a/tests/Zend/Dojo/Form/Decorator/TabContainerTest.php +++ b/tests/Zend/Dojo/Form/Decorator/TabContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -90,7 +90,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -108,7 +108,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -149,6 +149,6 @@ public function testRenderingShouldCreateDijit() } // Call Zend_Dojo_Form_Decorator_TabContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Decorator_TabContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Decorator_TabContainerTest::main") { Zend_Dojo_Form_Decorator_TabContainerTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/AllTests.php b/tests/Zend/Dojo/Form/Element/AllTests.php index d7b91e8be6..a0c67054d1 100644 --- a/tests/Zend/Dojo/Form/Element/AllTests.php +++ b/tests/Zend/Dojo/Form/Element/AllTests.php @@ -61,7 +61,7 @@ class Zend_Dojo_Form_Element_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -92,6 +92,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Dojo_Form_Element_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Dojo_Form_Element_AllTests::main') { Zend_Dojo_Form_Element_AllTests::main(); } diff --git a/tests/Zend/Dojo/Form/Element/ButtonTest.php b/tests/Zend/Dojo/Form/Element/ButtonTest.php index 0895866ebd..f11ba61e33 100644 --- a/tests/Zend/Dojo/Form/Element/ButtonTest.php +++ b/tests/Zend/Dojo/Form/Element/ButtonTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -85,7 +85,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -101,7 +101,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -206,6 +206,6 @@ public function testValuePropertyShouldNotBeRendered() } // Call Zend_Dojo_Form_Element_ButtonTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_ButtonTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_ButtonTest::main") { Zend_Dojo_Form_Element_ButtonTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/CheckBoxTest.php b/tests/Zend/Dojo/Form/Element/CheckBoxTest.php index b9107e817b..2a55b4e196 100644 --- a/tests/Zend/Dojo/Form/Element/CheckBoxTest.php +++ b/tests/Zend/Dojo/Form/Element/CheckBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -285,6 +285,6 @@ public function testCheckedValuesCanBePassedInConstructor() } // Call Zend_Dojo_Form_Element_CheckBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_CheckBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_CheckBoxTest::main") { Zend_Dojo_Form_Element_CheckBoxTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/ComboBoxTest.php b/tests/Zend/Dojo/Form/Element/ComboBoxTest.php index 5326183380..e3f76f662e 100644 --- a/tests/Zend/Dojo/Form/Element/ComboBoxTest.php +++ b/tests/Zend/Dojo/Form/Element/ComboBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -206,6 +206,6 @@ public function testComboBoxInSubFormShouldCreateJsonStoreBasedOnQualifiedId() } // Call Zend_Dojo_Form_Element_ComboBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_ComboBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_ComboBoxTest::main") { Zend_Dojo_Form_Element_ComboBoxTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/CurrencyTextBoxTest.php b/tests/Zend/Dojo/Form/Element/CurrencyTextBoxTest.php index e56bbb7fda..fad59f4a89 100644 --- a/tests/Zend/Dojo/Form/Element/CurrencyTextBoxTest.php +++ b/tests/Zend/Dojo/Form/Element/CurrencyTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -81,7 +81,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -97,7 +97,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -176,6 +176,6 @@ public function testShouldRenderCurrencyTextBoxDijit() } // Call Zend_Dojo_Form_Element_CurrencyTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_CurrencyTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_CurrencyTextBoxTest::main") { Zend_Dojo_Form_Element_CurrencyTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/DateTextBoxTest.php b/tests/Zend/Dojo/Form/Element/DateTextBoxTest.php index a252fcbb54..7e544cfcff 100644 --- a/tests/Zend/Dojo/Form/Element/DateTextBoxTest.php +++ b/tests/Zend/Dojo/Form/Element/DateTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -222,6 +222,6 @@ public function testCanSetValue() } // Call Zend_Dojo_Form_Element_DateTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_DateTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_DateTextBoxTest::main") { Zend_Dojo_Form_Element_DateTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/DijitTest.php b/tests/Zend/Dojo/Form/Element/DijitTest.php index 9b3dfc0c3a..8001dea173 100644 --- a/tests/Zend/Dojo/Form/Element/DijitTest.php +++ b/tests/Zend/Dojo/Form/Element/DijitTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -174,6 +174,6 @@ public function testElementShouldDojoEnableViewObject() } // Call Zend_Dojo_Form_Element_DijitTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_DijitTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_DijitTest::main") { Zend_Dojo_Form_Element_DijitTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/EditorTest.php b/tests/Zend/Dojo/Form/Element/EditorTest.php index f8c31e9298..e26cda9bcd 100644 --- a/tests/Zend/Dojo/Form/Element/EditorTest.php +++ b/tests/Zend/Dojo/Form/Element/EditorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -330,6 +330,6 @@ public function testExtraPluginAccessorsShouldProxyToDijitParams() } // Call Zend_Dojo_Form_Element_EditorTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_EditorTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_EditorTest::main") { Zend_Dojo_Form_Element_EditorTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/FilteringSelectTest.php b/tests/Zend/Dojo/Form/Element/FilteringSelectTest.php index 64344da99e..103598caf5 100644 --- a/tests/Zend/Dojo/Form/Element/FilteringSelectTest.php +++ b/tests/Zend/Dojo/Form/Element/FilteringSelectTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -166,6 +166,6 @@ public function testShouldNotRegisterInArrayValidatorWhenStoreProvided() } // Call Zend_Dojo_Form_Element_FilteringSelectTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_FilteringSelectTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_FilteringSelectTest::main") { Zend_Dojo_Form_Element_FilteringSelectTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/HorizontalSliderTest.php b/tests/Zend/Dojo/Form/Element/HorizontalSliderTest.php index 10cb091171..6fbcc2f5b2 100644 --- a/tests/Zend/Dojo/Form/Element/HorizontalSliderTest.php +++ b/tests/Zend/Dojo/Form/Element/HorizontalSliderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -362,6 +362,6 @@ public function testShouldRenderHorizontalSliderDijit() } // Call Zend_Dojo_Form_Element_HorizontalSliderTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_HorizontalSliderTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_HorizontalSliderTest::main") { Zend_Dojo_Form_Element_HorizontalSliderTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/NumberSpinnerTest.php b/tests/Zend/Dojo/Form/Element/NumberSpinnerTest.php index a322a2a72e..483237e3f9 100644 --- a/tests/Zend/Dojo/Form/Element/NumberSpinnerTest.php +++ b/tests/Zend/Dojo/Form/Element/NumberSpinnerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -236,6 +236,6 @@ public function testMinAndMaxValuesCanBeSetAsDecimalValues() } // Call Zend_Dojo_Form_Element_NumberSpinnerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_NumberSpinnerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_NumberSpinnerTest::main") { Zend_Dojo_Form_Element_NumberSpinnerTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/NumberTextBoxTest.php b/tests/Zend/Dojo/Form/Element/NumberTextBoxTest.php index cde255ad36..554b99a1fc 100644 --- a/tests/Zend/Dojo/Form/Element/NumberTextBoxTest.php +++ b/tests/Zend/Dojo/Form/Element/NumberTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -81,7 +81,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -97,7 +97,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -187,6 +187,6 @@ public function testShouldRenderNumberTextBoxDijit() } // Call Zend_Dojo_Form_Element_NumberTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_NumberTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_NumberTextBoxTest::main") { Zend_Dojo_Form_Element_NumberTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/PasswordTextBoxTest.php b/tests/Zend/Dojo/Form/Element/PasswordTextBoxTest.php index 586e5571e7..1ccf875568 100644 --- a/tests/Zend/Dojo/Form/Element/PasswordTextBoxTest.php +++ b/tests/Zend/Dojo/Form/Element/PasswordTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -138,6 +138,6 @@ public function testShouldRenderPasswordInput() } // Call Zend_Dojo_Form_Element_PasswordTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_PasswordTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_PasswordTextBoxTest::main") { Zend_Dojo_Form_Element_PasswordTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/RadioButtonTest.php b/tests/Zend/Dojo/Form/Element/RadioButtonTest.php index 75a3fb3542..0da93629e1 100644 --- a/tests/Zend/Dojo/Form/Element/RadioButtonTest.php +++ b/tests/Zend/Dojo/Form/Element/RadioButtonTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -242,6 +242,6 @@ public function testShouldNotValidateIfValueIsNotInArray() } // Call Zend_Dojo_Form_Element_RadioButtonTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_RadioButtonTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_RadioButtonTest::main") { Zend_Dojo_Form_Element_RadioButtonTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/SimpleTextareaTest.php b/tests/Zend/Dojo/Form/Element/SimpleTextareaTest.php index 121b3d63dc..068a3d9578 100644 --- a/tests/Zend/Dojo/Form/Element/SimpleTextareaTest.php +++ b/tests/Zend/Dojo/Form/Element/SimpleTextareaTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -85,7 +85,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -101,7 +101,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -135,6 +135,6 @@ public function testShouldRenderSimpleTextareaDijit() } // Call Zend_Dojo_Form_Element_SimpleTextareaTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_SimpleTextareaTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_SimpleTextareaTest::main") { Zend_Dojo_Form_Element_SimpleTextareaTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/SubmitButtonTest.php b/tests/Zend/Dojo/Form/Element/SubmitButtonTest.php index d095589750..b7688ea052 100644 --- a/tests/Zend/Dojo/Form/Element/SubmitButtonTest.php +++ b/tests/Zend/Dojo/Form/Element/SubmitButtonTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -85,7 +85,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -101,7 +101,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -210,6 +210,6 @@ public function testElementShouldRenderLabelAsInputValue() } // Call Zend_Dojo_Form_Element_SubmitButtonTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_SubmitButtonTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_SubmitButtonTest::main") { Zend_Dojo_Form_Element_SubmitButtonTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/TextBoxTest.php b/tests/Zend/Dojo/Form/Element/TextBoxTest.php index 66b67eec87..f55d1c051d 100644 --- a/tests/Zend/Dojo/Form/Element/TextBoxTest.php +++ b/tests/Zend/Dojo/Form/Element/TextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -171,6 +171,6 @@ public function testMaxLengthAccessorsShouldProxyToDijitParams() } // Call Zend_Dojo_Form_Element_TextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_TextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_TextBoxTest::main") { Zend_Dojo_Form_Element_TextBoxTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/TextareaTest.php b/tests/Zend/Dojo/Form/Element/TextareaTest.php index 661402c2c3..2746f09fcd 100644 --- a/tests/Zend/Dojo/Form/Element/TextareaTest.php +++ b/tests/Zend/Dojo/Form/Element/TextareaTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -132,6 +132,6 @@ public function testShouldRenderTextareaDijit() } // Call Zend_Dojo_Form_Element_TextareaTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_TextareaTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_TextareaTest::main") { Zend_Dojo_Form_Element_TextareaTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/TimeTextBoxTest.php b/tests/Zend/Dojo/Form/Element/TimeTextBoxTest.php index 12b52d17c1..e4e19cdf68 100644 --- a/tests/Zend/Dojo/Form/Element/TimeTextBoxTest.php +++ b/tests/Zend/Dojo/Form/Element/TimeTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -207,6 +207,6 @@ public function testCanSetValue() } // Call Zend_Dojo_Form_Element_TimeTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_TimeTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_TimeTextBoxTest::main") { Zend_Dojo_Form_Element_TimeTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/ValidationTextBoxTest.php b/tests/Zend/Dojo/Form/Element/ValidationTextBoxTest.php index b00c3cf3d3..38c9ff8828 100644 --- a/tests/Zend/Dojo/Form/Element/ValidationTextBoxTest.php +++ b/tests/Zend/Dojo/Form/Element/ValidationTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -205,6 +205,6 @@ public function testSettingMultipleConstraintsShouldNotOverridePreviousConstrain } // Call Zend_Dojo_Form_Element_ValidationTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_ValidationTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_ValidationTextBoxTest::main") { Zend_Dojo_Form_Element_ValidationTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/Form/Element/VerticalSliderTest.php b/tests/Zend/Dojo/Form/Element/VerticalSliderTest.php index 04b9185ee4..4bea7c84ef 100644 --- a/tests/Zend/Dojo/Form/Element/VerticalSliderTest.php +++ b/tests/Zend/Dojo/Form/Element/VerticalSliderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -299,6 +299,6 @@ public function testShouldRenderVerticalSliderDijit() } // Call Zend_Dojo_Form_Element_VerticalSliderTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_Element_VerticalSliderTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_Element_VerticalSliderTest::main") { Zend_Dojo_Form_Element_VerticalSliderTest::main(); } diff --git a/tests/Zend/Dojo/Form/FormTest.php b/tests/Zend/Dojo/Form/FormTest.php index 470e94a31e..6938712c2c 100644 --- a/tests/Zend/Dojo/Form/FormTest.php +++ b/tests/Zend/Dojo/Form/FormTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -71,7 +71,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->form = new Zend_Dojo_Form(); $this->form->addElement('TextBox', 'foo') @@ -85,7 +85,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -151,6 +151,6 @@ public function testHtmlTagDecoratorShouldHaveZendFormDojoClassByDefault() } // Call Zend_Dojo_Form_FormTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_FormTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_FormTest::main") { Zend_Dojo_Form_FormTest::main(); } diff --git a/tests/Zend/Dojo/Form/SubFormTest.php b/tests/Zend/Dojo/Form/SubFormTest.php index 8dd00ea7d4..415d38f619 100644 --- a/tests/Zend/Dojo/Form/SubFormTest.php +++ b/tests/Zend/Dojo/Form/SubFormTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -71,7 +71,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->form = new Zend_Dojo_Form_SubForm(); $this->form->addElement('TextBox', 'foo') @@ -85,7 +85,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -133,6 +133,6 @@ public function testShouldRegisterDojoViewHelperPath() } // Call Zend_Dojo_Form_SubFormTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_Form_SubFormTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_Form_SubFormTest::main") { Zend_Dojo_Form_SubFormTest::main(); } diff --git a/tests/Zend/Dojo/View/AllTests.php b/tests/Zend/Dojo/View/AllTests.php index a671500cef..6cb81487d5 100644 --- a/tests/Zend/Dojo/View/AllTests.php +++ b/tests/Zend/Dojo/View/AllTests.php @@ -43,7 +43,7 @@ class Zend_Dojo_View_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -56,6 +56,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Dojo_View_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Dojo_View_AllTests::main') { Zend_Dojo_View_AllTests::main(); } diff --git a/tests/Zend/Dojo/View/Helper/AccordionContainerTest.php b/tests/Zend/Dojo/View/Helper/AccordionContainerTest.php index 6d3fde6a5b..71ba54e9fa 100644 --- a/tests/Zend/Dojo/View/Helper/AccordionContainerTest.php +++ b/tests/Zend/Dojo/View/Helper/AccordionContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -178,6 +178,6 @@ public function testCapturingShouldRaiseErrorWhenNonexistentIdPassedToEnd() } // Call Zend_Dojo_View_Helper_AccordionContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_AccordionContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_AccordionContainerTest::main") { Zend_Dojo_View_Helper_AccordionContainerTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/AccordionPaneTest.php b/tests/Zend/Dojo/View/Helper/AccordionPaneTest.php index aa0f477187..f6f51253c1 100644 --- a/tests/Zend/Dojo/View/Helper/AccordionPaneTest.php +++ b/tests/Zend/Dojo/View/Helper/AccordionPaneTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -131,6 +131,6 @@ public function testShouldAllowProgrammaticDijitCreation() } // Call Zend_Dojo_View_Helper_AccordionPaneTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_AccordionPaneTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_AccordionPaneTest::main") { Zend_Dojo_View_Helper_AccordionPaneTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/AllTests.php b/tests/Zend/Dojo/View/Helper/AllTests.php index 8e59151010..f1cef10141 100644 --- a/tests/Zend/Dojo/View/Helper/AllTests.php +++ b/tests/Zend/Dojo/View/Helper/AllTests.php @@ -70,7 +70,7 @@ class Zend_Dojo_View_Helper_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -110,6 +110,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Dojo_View_Helper_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Dojo_View_Helper_AllTests::main') { Zend_Dojo_View_Helper_AllTests::main(); } diff --git a/tests/Zend/Dojo/View/Helper/BorderContainerTest.php b/tests/Zend/Dojo/View/Helper/BorderContainerTest.php index f05afd4c42..b2d8420690 100644 --- a/tests/Zend/Dojo/View/Helper/BorderContainerTest.php +++ b/tests/Zend/Dojo/View/Helper/BorderContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -149,6 +149,6 @@ public function testMultipleCallsToBorderContainerShouldNotCreateMultipleStyleEn } // Call Zend_Dojo_View_Helper_BorderContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_BorderContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_BorderContainerTest::main") { Zend_Dojo_View_Helper_BorderContainerTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/ButtonTest.php b/tests/Zend/Dojo/View/Helper/ButtonTest.php index b3b5ea3bc0..cfb98e50d4 100644 --- a/tests/Zend/Dojo/View/Helper/ButtonTest.php +++ b/tests/Zend/Dojo/View/Helper/ButtonTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -81,7 +81,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -97,7 +97,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -139,6 +139,6 @@ public function testShouldAllowProgrammaticDijitCreation() } // Call Zend_Dojo_View_Helper_ButtonTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_ButtonTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_ButtonTest::main") { Zend_Dojo_View_Helper_ButtonTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/CheckBoxTest.php b/tests/Zend/Dojo/View/Helper/CheckBoxTest.php index 6817eb2822..e7cbec5059 100644 --- a/tests/Zend/Dojo/View/Helper/CheckBoxTest.php +++ b/tests/Zend/Dojo/View/Helper/CheckBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -183,6 +183,6 @@ public function testElementShouldCreateAppropriateIdWhenNameIncludesArrayNotatio } // Call Zend_Dojo_View_Helper_CheckBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_CheckBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_CheckBoxTest::main") { Zend_Dojo_View_Helper_CheckBoxTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/ComboBoxTest.php b/tests/Zend/Dojo/View/Helper/ComboBoxTest.php index e3667e51aa..cd0503adcf 100644 --- a/tests/Zend/Dojo/View/Helper/ComboBoxTest.php +++ b/tests/Zend/Dojo/View/Helper/ComboBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -238,6 +238,6 @@ public function testStoreCreationWhenUsingProgrammaticCreationShouldRegisterAsDo } // Call Zend_Dojo_View_Helper_ComboBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_ComboBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_ComboBoxTest::main") { Zend_Dojo_View_Helper_ComboBoxTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/ContentPaneTest.php b/tests/Zend/Dojo/View/Helper/ContentPaneTest.php index c6db6ccc40..8b326d4b6b 100644 --- a/tests/Zend/Dojo/View/Helper/ContentPaneTest.php +++ b/tests/Zend/Dojo/View/Helper/ContentPaneTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -154,6 +154,6 @@ public function testCaptureStartShouldReturnVoid() } // Call Zend_Dojo_View_Helper_ContentPaneTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_ContentPaneTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_ContentPaneTest::main") { Zend_Dojo_View_Helper_ContentPaneTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/CurrencyTextBoxTest.php b/tests/Zend/Dojo/View/Helper/CurrencyTextBoxTest.php index 911c3e9af1..dd33bfdffc 100644 --- a/tests/Zend/Dojo/View/Helper/CurrencyTextBoxTest.php +++ b/tests/Zend/Dojo/View/Helper/CurrencyTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -146,6 +146,6 @@ public function testShouldCreateTextInput() } // Call Zend_Dojo_View_Helper_CurrencyTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_CurrencyTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_CurrencyTextBoxTest::main") { Zend_Dojo_View_Helper_CurrencyTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/CustomDijitTest.php b/tests/Zend/Dojo/View/Helper/CustomDijitTest.php index 84e39e5a4e..3413d73a6b 100644 --- a/tests/Zend/Dojo/View/Helper/CustomDijitTest.php +++ b/tests/Zend/Dojo/View/Helper/CustomDijitTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -77,7 +77,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -91,7 +91,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -190,6 +190,6 @@ public function fooContentPane($id = null, $value = null, array $params = [], ar } // Call Zend_Dojo_View_Helper_CustomDijitTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_CustomDijitTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_CustomDijitTest::main") { Zend_Dojo_View_Helper_CustomDijitTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/DateTextBoxTest.php b/tests/Zend/Dojo/View/Helper/DateTextBoxTest.php index 1a93653dfd..b615596eb6 100644 --- a/tests/Zend/Dojo/View/Helper/DateTextBoxTest.php +++ b/tests/Zend/Dojo/View/Helper/DateTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -144,6 +144,6 @@ public function testShouldCreateTextInput() } // Call Zend_Dojo_View_Helper_DateTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_DateTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_DateTextBoxTest::main") { Zend_Dojo_View_Helper_DateTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/DojoTest.php b/tests/Zend/Dojo/View/Helper/DojoTest.php index 8f68156237..690d2b8f6b 100644 --- a/tests/Zend/Dojo/View/Helper/DojoTest.php +++ b/tests/Zend/Dojo/View/Helper/DojoTest.php @@ -1,5 +1,5 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -81,7 +81,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); $this->view = $this->getView(); @@ -97,7 +97,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -985,6 +985,6 @@ public function setupDojo() } // Call Zend_Dojo_View_Helper_DojoTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_DojoTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_DojoTest::main") { Zend_Dojo_View_Helper_DojoTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/EditorTest.php b/tests/Zend/Dojo/View/Helper/EditorTest.php index 2364d64907..fe623dcf2f 100644 --- a/tests/Zend/Dojo/View/Helper/EditorTest.php +++ b/tests/Zend/Dojo/View/Helper/EditorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -248,6 +248,6 @@ public function testHelperShouldJsonifyExtraPlugins() } // Call Zend_Dojo_View_Helper_EditorTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_EditorTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_EditorTest::main") { Zend_Dojo_View_Helper_EditorTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/FilteringSelectTest.php b/tests/Zend/Dojo/View/Helper/FilteringSelectTest.php index 4842a518e4..b5d9e6fa1f 100644 --- a/tests/Zend/Dojo/View/Helper/FilteringSelectTest.php +++ b/tests/Zend/Dojo/View/Helper/FilteringSelectTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -193,6 +193,6 @@ public function testShouldAllowProgrammaticDijitCreationAsRemoter() } // Call Zend_Dojo_View_Helper_FilteringSelectTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_FilteringSelectTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_FilteringSelectTest::main") { Zend_Dojo_View_Helper_FilteringSelectTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/FormTest.php b/tests/Zend/Dojo/View/Helper/FormTest.php index b02e48d82a..5cde723973 100644 --- a/tests/Zend/Dojo/View/Helper/FormTest.php +++ b/tests/Zend/Dojo/View/Helper/FormTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -151,6 +151,6 @@ public function testShouldNotRenderClosingTagIfContentIsFalse() } // Call Zend_Dojo_View_Helper_FormTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_FormTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_FormTest::main") { Zend_Dojo_View_Helper_FormTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/HorizontalSliderTest.php b/tests/Zend/Dojo/View/Helper/HorizontalSliderTest.php index 549c6b0a55..ce088fc617 100644 --- a/tests/Zend/Dojo/View/Helper/HorizontalSliderTest.php +++ b/tests/Zend/Dojo/View/Helper/HorizontalSliderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -88,7 +88,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -104,7 +104,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -337,6 +337,6 @@ public function testLabelDivShouldOpenAndCloseBeforeLabelOl() } // Call Zend_Dojo_View_Helper_HorizontalSliderTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_HorizontalSliderTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_HorizontalSliderTest::main") { Zend_Dojo_View_Helper_HorizontalSliderTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/NumberSpinnerTest.php b/tests/Zend/Dojo/View/Helper/NumberSpinnerTest.php index c922fc8d28..98b9ffe238 100644 --- a/tests/Zend/Dojo/View/Helper/NumberSpinnerTest.php +++ b/tests/Zend/Dojo/View/Helper/NumberSpinnerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -178,6 +178,6 @@ public function testInvalidConstraintsShouldBeStrippedPriorToRendering() } // Call Zend_Dojo_View_Helper_NumberSpinnerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_NumberSpinnerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_NumberSpinnerTest::main") { Zend_Dojo_View_Helper_NumberSpinnerTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/NumberTextBoxTest.php b/tests/Zend/Dojo/View/Helper/NumberTextBoxTest.php index 6dfc316090..9bc595e397 100644 --- a/tests/Zend/Dojo/View/Helper/NumberTextBoxTest.php +++ b/tests/Zend/Dojo/View/Helper/NumberTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -145,6 +145,6 @@ public function testShouldCreateTextInput() } // Call Zend_Dojo_View_Helper_NumberTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_NumberTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_NumberTextBoxTest::main") { Zend_Dojo_View_Helper_NumberTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/PasswordTextBoxTest.php b/tests/Zend/Dojo/View/Helper/PasswordTextBoxTest.php index 8b70c0e7bd..64e6aba6d3 100644 --- a/tests/Zend/Dojo/View/Helper/PasswordTextBoxTest.php +++ b/tests/Zend/Dojo/View/Helper/PasswordTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -144,6 +144,6 @@ public function testShouldCreatePasswordInput() } // Call Zend_Dojo_View_Helper_PasswordTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_PasswordTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_PasswordTextBoxTest::main") { Zend_Dojo_View_Helper_PasswordTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/RadioButtonTest.php b/tests/Zend/Dojo/View/Helper/RadioButtonTest.php index 13e0b67479..d2ac52d34e 100644 --- a/tests/Zend/Dojo/View/Helper/RadioButtonTest.php +++ b/tests/Zend/Dojo/View/Helper/RadioButtonTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -140,6 +140,6 @@ public function testShouldAllowProgrammaticDijitCreation() } // Call Zend_Dojo_View_Helper_RadioButtonTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_RadioButtonTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_RadioButtonTest::main") { Zend_Dojo_View_Helper_RadioButtonTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/SimpleTextareaTest.php b/tests/Zend/Dojo/View/Helper/SimpleTextareaTest.php index f393c7892c..864ece9f31 100644 --- a/tests/Zend/Dojo/View/Helper/SimpleTextareaTest.php +++ b/tests/Zend/Dojo/View/Helper/SimpleTextareaTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -85,7 +85,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -101,7 +101,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -145,6 +145,6 @@ public function testPassingIdAsAttributeShouldOverrideUsingNameAsId() } // Call Zend_Dojo_View_Helper_SimpleTextareaTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_SimpleTextareaTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_SimpleTextareaTest::main") { Zend_Dojo_View_Helper_SimpleTextareaTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/SplitContainerTest.php b/tests/Zend/Dojo/View/Helper/SplitContainerTest.php index f4a60e0e6a..75e0a532e2 100644 --- a/tests/Zend/Dojo/View/Helper/SplitContainerTest.php +++ b/tests/Zend/Dojo/View/Helper/SplitContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -137,6 +137,6 @@ public function testShouldAllowProgrammaticDijitCreation() } // Call Zend_Dojo_View_Helper_SplitContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_SplitContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_SplitContainerTest::main") { Zend_Dojo_View_Helper_SplitContainerTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/StackContainerTest.php b/tests/Zend/Dojo/View/Helper/StackContainerTest.php index b9f804f4b7..a143a5e891 100644 --- a/tests/Zend/Dojo/View/Helper/StackContainerTest.php +++ b/tests/Zend/Dojo/View/Helper/StackContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -79,7 +79,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -95,7 +95,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -134,6 +134,6 @@ public function testShouldAllowProgrammaticDijitCreation() } // Call Zend_Dojo_View_Helper_StackContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_StackContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_StackContainerTest::main") { Zend_Dojo_View_Helper_StackContainerTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/SubmitButtonTest.php b/tests/Zend/Dojo/View/Helper/SubmitButtonTest.php index d492be8ef3..f4942c5122 100644 --- a/tests/Zend/Dojo/View/Helper/SubmitButtonTest.php +++ b/tests/Zend/Dojo/View/Helper/SubmitButtonTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -79,7 +79,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -95,7 +95,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -144,6 +144,6 @@ public function testHelperShouldRenderContentKeyAsLabelWhenPassed() } // Call Zend_Dojo_View_Helper_SubmitButtonTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_SubmitButtonTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_SubmitButtonTest::main") { Zend_Dojo_View_Helper_SubmitButtonTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/TabContainerTest.php b/tests/Zend/Dojo/View/Helper/TabContainerTest.php index 141f336b32..152f977d2c 100644 --- a/tests/Zend/Dojo/View/Helper/TabContainerTest.php +++ b/tests/Zend/Dojo/View/Helper/TabContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -137,6 +137,6 @@ public function testShouldAllowProgrammaticDijitCreation() } // Call Zend_Dojo_View_Helper_TabContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_TabContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_TabContainerTest::main") { Zend_Dojo_View_Helper_TabContainerTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/TextBoxTest.php b/tests/Zend/Dojo/View/Helper/TextBoxTest.php index 29404f5472..36eb3ab219 100644 --- a/tests/Zend/Dojo/View/Helper/TextBoxTest.php +++ b/tests/Zend/Dojo/View/Helper/TextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -146,6 +146,6 @@ public function testShouldCreateTextInput() } // Call Zend_Dojo_View_Helper_TextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_TextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_TextBoxTest::main") { Zend_Dojo_View_Helper_TextBoxTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/TextareaTest.php b/tests/Zend/Dojo/View/Helper/TextareaTest.php index a14f0c09b5..d6be4c9b5e 100644 --- a/tests/Zend/Dojo/View/Helper/TextareaTest.php +++ b/tests/Zend/Dojo/View/Helper/TextareaTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -148,6 +148,6 @@ public function testGeneratedMarkupShouldNotIncludeTypeAttribute() } // Call Zend_Dojo_View_Helper_TextareaTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_TextareaTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_TextareaTest::main") { Zend_Dojo_View_Helper_TextareaTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/TimeTextBoxTest.php b/tests/Zend/Dojo/View/Helper/TimeTextBoxTest.php index a8001163ee..da13400706 100644 --- a/tests/Zend/Dojo/View/Helper/TimeTextBoxTest.php +++ b/tests/Zend/Dojo/View/Helper/TimeTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -144,6 +144,6 @@ public function testShouldCreateTextInput() } // Call Zend_Dojo_View_Helper_TimeTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_TimeTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_TimeTextBoxTest::main") { Zend_Dojo_View_Helper_TimeTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/ValidationTextBoxTest.php b/tests/Zend/Dojo/View/Helper/ValidationTextBoxTest.php index e8a073839f..30a3352f9e 100644 --- a/tests/Zend/Dojo/View/Helper/ValidationTextBoxTest.php +++ b/tests/Zend/Dojo/View/Helper/ValidationTextBoxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -171,6 +171,6 @@ public function testFalseRequiredParameterShouldBeRenderedAsStringValue() } // Call Zend_Dojo_View_Helper_ValidationTextBoxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_ValidationTextBoxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_ValidationTextBoxTest::main") { Zend_Dojo_View_Helper_ValidationTextBoxTest::main(); } diff --git a/tests/Zend/Dojo/View/Helper/VerticalSliderTest.php b/tests/Zend/Dojo/View/Helper/VerticalSliderTest.php index 0b232f665b..d47103f802 100644 --- a/tests/Zend/Dojo/View/Helper/VerticalSliderTest.php +++ b/tests/Zend/Dojo/View/Helper/VerticalSliderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Dojo_View_Helper_Dojo::setUseDeclarative(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -235,6 +235,6 @@ public function testShouldIgnoreTopAndBottomDecorationsWhenPassed() } // Call Zend_Dojo_View_Helper_VerticalSliderTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dojo_View_Helper_VerticalSliderTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dojo_View_Helper_VerticalSliderTest::main") { Zend_Dojo_View_Helper_VerticalSliderTest::main(); } diff --git a/tests/Zend/Dom/AllTests.php b/tests/Zend/Dom/AllTests.php index c0d4410ee2..b599ab412a 100644 --- a/tests/Zend/Dom/AllTests.php +++ b/tests/Zend/Dom/AllTests.php @@ -44,7 +44,7 @@ class Zend_Dom_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Dom_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Dom_AllTests::main') { Zend_Dom_AllTests::main(); } diff --git a/tests/Zend/Dom/Query/Css2XpathTest.php b/tests/Zend/Dom/Query/Css2XpathTest.php index deb2404214..c2d95a6db1 100644 --- a/tests/Zend/Dom/Query/Css2XpathTest.php +++ b/tests/Zend/Dom/Query/Css2XpathTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -77,7 +77,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->query = new Zend_Dom_Query(); } @@ -88,7 +88,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -403,6 +403,6 @@ public function testLoadingXmlContainingDoctypeShouldFailToPreventXxeAndXeeAttac } // Call Zend_Dom_QueryTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Dom_QueryTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Dom_QueryTest::main") { Zend_Dom_QueryTest::main(); } diff --git a/tests/Zend/EventManager/AllTests.php b/tests/Zend/EventManager/AllTests.php index b3c90d10db..fc193c5346 100644 --- a/tests/Zend/EventManager/AllTests.php +++ b/tests/Zend/EventManager/AllTests.php @@ -46,7 +46,7 @@ class Zend_EventManager_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -63,6 +63,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_EventManager_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_EventManager_AllTests::main') { Zend_EventManager_AllTests::main(); } diff --git a/tests/Zend/EventManager/EventManagerTest.php b/tests/Zend/EventManager/EventManagerTest.php index 794aa6a8d2..0ab109694f 100644 --- a/tests/Zend/EventManager/EventManagerTest.php +++ b/tests/Zend/EventManager/EventManagerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (isset($this->message)) { unset($this->message); @@ -717,6 +717,6 @@ public function returnOnEvent($result) } } -if (PHPUnit_MAIN_METHOD == 'Zend_EventManager_EventManagerTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_EventManager_EventManagerTest::main') { Zend_EventManager_EventManagerTest::main(); } diff --git a/tests/Zend/EventManager/FilterChainTest.php b/tests/Zend/EventManager/FilterChainTest.php index 3d6e8f9c0a..0cabebde25 100644 --- a/tests/Zend/EventManager/FilterChainTest.php +++ b/tests/Zend/EventManager/FilterChainTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (isset($this->message)) { unset($this->message); @@ -178,6 +178,6 @@ public function filterHashMd5($context, $params, $chain) } } -if (PHPUnit_MAIN_METHOD == 'Zend_EventManager_FilterChainTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_EventManager_FilterChainTest::main') { Zend_EventManager_FilterChainTest::main(); } diff --git a/tests/Zend/EventManager/GlobalEventManagerTest.php b/tests/Zend/EventManager/GlobalEventManagerTest.php index 9c02a67358..a027d61fb2 100644 --- a/tests/Zend/EventManager/GlobalEventManagerTest.php +++ b/tests/Zend/EventManager/GlobalEventManagerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { Zend_EventManager_GlobalEventManager::setEventCollection(null); } @@ -127,6 +127,6 @@ public function returnOnArray($result) } } -if (PHPUnit_MAIN_METHOD == 'Zend_EventManager_GlobalEventManagerTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_EventManager_GlobalEventManagerTest::main') { Zend_EventManager_GlobalEventManagerTest::main(); } diff --git a/tests/Zend/EventManager/StaticEventManagerTest.php b/tests/Zend/EventManager/StaticEventManagerTest.php index 49597c7deb..24c7a3bc4d 100644 --- a/tests/Zend/EventManager/StaticEventManagerTest.php +++ b/tests/Zend/EventManager/StaticEventManagerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { Zend_EventManager_StaticEventManager::resetInstance(); } - protected function tearDown(): void + protected function tear_down() { Zend_EventManager_StaticEventManager::resetInstance(); } @@ -278,6 +278,6 @@ public function advanceTriggered($e) } } -if (PHPUnit_MAIN_METHOD == 'Zend_EventManager_StaticEventManagerTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_EventManager_StaticEventManagerTest::main') { Zend_EventManager_StaticEventManagerTest::main(); } diff --git a/tests/Zend/EventManager/StaticIntegrationTest.php b/tests/Zend/EventManager/StaticIntegrationTest.php index 8bf8868557..41c0cd709b 100644 --- a/tests/Zend/EventManager/StaticIntegrationTest.php +++ b/tests/Zend/EventManager/StaticIntegrationTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { Zend_EventManager_StaticEventManager::resetInstance(); } @@ -183,6 +183,6 @@ public function aggregateLocal3($e) } } -if (PHPUnit_MAIN_METHOD == 'Zend_EventManager_StaticIntegrationTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_EventManager_StaticIntegrationTest::main') { Zend_EventManager_StaticIntegrationTest::main(); } diff --git a/tests/Zend/ExceptionTest.php b/tests/Zend/ExceptionTest.php index 9535590ad3..2b37a11adc 100644 --- a/tests/Zend/ExceptionTest.php +++ b/tests/Zend/ExceptionTest.php @@ -1,6 +1,6 @@ baseUri) { - parent::tearDown(); + parent::tear_down(); return; } diff --git a/tests/Zend/Feed/AllTests.php b/tests/Zend/Feed/AllTests.php index 8e1909592c..96a100e825 100644 --- a/tests/Zend/Feed/AllTests.php +++ b/tests/Zend/Feed/AllTests.php @@ -80,7 +80,7 @@ class Zend_Feed_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -142,6 +142,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Feed_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Feed_AllTests::main') { Zend_Feed_AllTests::main(); } diff --git a/tests/Zend/Feed/ArrayAccessTest.php b/tests/Zend/Feed/ArrayAccessTest.php index 8b8799d58f..c162a538dd 100644 --- a/tests/Zend/Feed/ArrayAccessTest.php +++ b/tests/Zend/Feed/ArrayAccessTest.php @@ -1,6 +1,6 @@ _feed = Zend_Feed::importFile(dirname(__FILE__) . '/_files/TestAtomFeed.xml'); $this->_nsfeed = Zend_Feed::importFile(dirname(__FILE__) . '/_files/TestAtomFeedNamespaced.xml'); diff --git a/tests/Zend/Feed/AtomEntryOnlyTest.php b/tests/Zend/Feed/AtomEntryOnlyTest.php index 94f275602c..0c9e8160c8 100644 --- a/tests/Zend/Feed/AtomEntryOnlyTest.php +++ b/tests/Zend/Feed/AtomEntryOnlyTest.php @@ -1,6 +1,6 @@ _uri = 'http://fubar.com/myFeed'; } - protected function tearDown(): void + protected function tear_down() { Zend_Feed::setHttpClient(new Zend_Http_Client()); } diff --git a/tests/Zend/Feed/CountTest.php b/tests/Zend/Feed/CountTest.php index 410879e68f..fbd8b376e1 100644 --- a/tests/Zend/Feed/CountTest.php +++ b/tests/Zend/Feed/CountTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Http_Client_Adapter_Test(); Zend_Feed::setHttpClient(new Zend_Http_Client(null, ['adapter' => $this->_adapter])); diff --git a/tests/Zend/Feed/IteratorTest.php b/tests/Zend/Feed/IteratorTest.php index e7871213af..f2ec7ec853 100644 --- a/tests/Zend/Feed/IteratorTest.php +++ b/tests/Zend/Feed/IteratorTest.php @@ -1,6 +1,6 @@ _feed = Zend_Feed::importFile(dirname(__FILE__) . '/_files/TestAtomFeed.xml'); $this->_nsfeed = Zend_Feed::importFile(dirname(__FILE__) . '/_files/TestAtomFeedNamespaced.xml'); diff --git a/tests/Zend/Feed/Pubsubhubbub/AllTests.php b/tests/Zend/Feed/Pubsubhubbub/AllTests.php index 4b6a364cc7..a5f0d1a6c0 100644 --- a/tests/Zend/Feed/Pubsubhubbub/AllTests.php +++ b/tests/Zend/Feed/Pubsubhubbub/AllTests.php @@ -48,7 +48,7 @@ class Zend_Feed_Pubsubhubbub_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -66,6 +66,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Feed_Pubsubhubbub_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Feed_Pubsubhubbub_AllTests::main') { Zend_Feed_Pubsubhubbub_AllTests::main(); } diff --git a/tests/Zend/Feed/Pubsubhubbub/Model/AllTests.php b/tests/Zend/Feed/Pubsubhubbub/Model/AllTests.php index 8f13954f96..57dbff21d2 100644 --- a/tests/Zend/Feed/Pubsubhubbub/Model/AllTests.php +++ b/tests/Zend/Feed/Pubsubhubbub/Model/AllTests.php @@ -42,7 +42,7 @@ class Zend_Feed_Pubsubhubbub_Model_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -53,6 +53,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Feed_Pubsubhubbub_Model_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Feed_Pubsubhubbub_Model_AllTests::main') { Zend_Feed_Pubsubhubbub_AllTests::main(); } diff --git a/tests/Zend/Feed/Pubsubhubbub/Model/SubscriptionTest.php b/tests/Zend/Feed/Pubsubhubbub/Model/SubscriptionTest.php index fdece53a14..0b08c74791 100644 --- a/tests/Zend/Feed/Pubsubhubbub/Model/SubscriptionTest.php +++ b/tests/Zend/Feed/Pubsubhubbub/Model/SubscriptionTest.php @@ -1,6 +1,6 @@ _callback = new Zend_Feed_Pubsubhubbub_Subscriber_Callback(); @@ -101,7 +101,7 @@ protected function setUp(): void $_SERVER['QUERY_STRING'] = 'xhub.subscription=verifytokenkey'; } - protected function tearDown(): void + protected function tear_down() { $_SERVER = $this->_originalServer; } diff --git a/tests/Zend/Feed/Pubsubhubbub/SubscriberHttpTest.php b/tests/Zend/Feed/Pubsubhubbub/SubscriberHttpTest.php index d926b7f114..a7e8b90102 100644 --- a/tests/Zend/Feed/Pubsubhubbub/SubscriberHttpTest.php +++ b/tests/Zend/Feed/Pubsubhubbub/SubscriberHttpTest.php @@ -1,6 +1,6 @@ 'Zend_Http_Client_Adapter_Socket' ]; - protected function setUp(): void + protected function set_up() { if (defined('TESTS_Zend_Feed_Pubsubhubbub_BASEURI') && Zend_Uri_Http::check(TESTS_Zend_Feed_Pubsubhubbub_BASEURI)) { diff --git a/tests/Zend/Feed/Pubsubhubbub/SubscriberTest.php b/tests/Zend/Feed/Pubsubhubbub/SubscriberTest.php index f1de0d51f7..ea2c87130d 100644 --- a/tests/Zend/Feed/Pubsubhubbub/SubscriberTest.php +++ b/tests/Zend/Feed/Pubsubhubbub/SubscriberTest.php @@ -1,6 +1,6 @@ _options); } diff --git a/tests/Zend/Feed/Reader/Entry/AtomTest.php b/tests/Zend/Feed/Reader/Entry/AtomTest.php index 9f3adbaded..3ff3325225 100644 --- a/tests/Zend/Feed/Reader/Entry/AtomTest.php +++ b/tests/Zend/Feed/Reader/Entry/AtomTest.php @@ -1,6 +1,6 @@ _options); } diff --git a/tests/Zend/Feed/Reader/Entry/CommonTest.php b/tests/Zend/Feed/Reader/Entry/CommonTest.php index 71d3b9168c..5008ba1965 100644 --- a/tests/Zend/Feed/Reader/Entry/CommonTest.php +++ b/tests/Zend/Feed/Reader/Entry/CommonTest.php @@ -1,6 +1,6 @@ _options); } diff --git a/tests/Zend/Feed/Reader/Feed/AtomSourceTest.php b/tests/Zend/Feed/Reader/Feed/AtomSourceTest.php index 75860e9cea..22c94fa645 100644 --- a/tests/Zend/Feed/Reader/Feed/AtomSourceTest.php +++ b/tests/Zend/Feed/Reader/Feed/AtomSourceTest.php @@ -1,6 +1,6 @@ _options); } diff --git a/tests/Zend/Feed/Reader/Feed/AtomTest.php b/tests/Zend/Feed/Reader/Feed/AtomTest.php index 3f0cc24095..d2345fb188 100644 --- a/tests/Zend/Feed/Reader/Feed/AtomTest.php +++ b/tests/Zend/Feed/Reader/Feed/AtomTest.php @@ -1,6 +1,6 @@ _options); } diff --git a/tests/Zend/Feed/Reader/Feed/CommonTest.php b/tests/Zend/Feed/Reader/Feed/CommonTest.php index 1fb22e119a..80d862e6a9 100644 --- a/tests/Zend/Feed/Reader/Feed/CommonTest.php +++ b/tests/Zend/Feed/Reader/Feed/CommonTest.php @@ -1,6 +1,6 @@ _options); } diff --git a/tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php b/tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php index fc178af07c..2715c36035 100644 --- a/tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php +++ b/tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php @@ -1,6 +1,6 @@ _feedSamplePath = dirname(__FILE__) . '/_files/h-online.com-atom10.xml'; @@ -56,7 +56,7 @@ protected function setUp(): void Zend_Date::setOptions(['format_type' => 'iso']); } - protected function tearDown(): void + protected function tear_down() { Zend_Date::setOptions($this->_options); } diff --git a/tests/Zend/Feed/Reader/Integration/LautDeRdfTest.php b/tests/Zend/Feed/Reader/Integration/LautDeRdfTest.php index aa2bf00fff..3f669087fb 100644 --- a/tests/Zend/Feed/Reader/Integration/LautDeRdfTest.php +++ b/tests/Zend/Feed/Reader/Integration/LautDeRdfTest.php @@ -1,6 +1,6 @@ _feedSamplePath = dirname(__FILE__) . '/_files/laut.de-rdf.xml'; @@ -56,7 +56,7 @@ protected function setUp(): void Zend_Date::setOptions(['format_type' => 'iso']); } - protected function tearDown(): void + protected function tear_down() { Zend_Date::setOptions($this->_options); } diff --git a/tests/Zend/Feed/Reader/Integration/PodcastRss2Test.php b/tests/Zend/Feed/Reader/Integration/PodcastRss2Test.php index 12115a9a6c..9f2ec8459e 100644 --- a/tests/Zend/Feed/Reader/Integration/PodcastRss2Test.php +++ b/tests/Zend/Feed/Reader/Integration/PodcastRss2Test.php @@ -1,6 +1,6 @@ _feedSamplePath = dirname(__FILE__) . '/_files/podcast.xml'; @@ -56,7 +56,7 @@ protected function setUp(): void Zend_Date::setOptions(['format_type' => 'iso']); } - protected function tearDown(): void + protected function tear_down() { Zend_Date::setOptions($this->_options); } diff --git a/tests/Zend/Feed/Reader/Integration/WordpressAtom10Test.php b/tests/Zend/Feed/Reader/Integration/WordpressAtom10Test.php index 145fbd9019..ab3b460a7b 100644 --- a/tests/Zend/Feed/Reader/Integration/WordpressAtom10Test.php +++ b/tests/Zend/Feed/Reader/Integration/WordpressAtom10Test.php @@ -1,6 +1,6 @@ _feedSamplePath = dirname(__FILE__) . '/_files/wordpress-atom10.xml'; @@ -56,7 +56,7 @@ protected function setUp(): void Zend_Date::setOptions(['format_type' => 'iso']); } - protected function tearDown(): void + protected function tear_down() { Zend_Date::setOptions($this->_options); } diff --git a/tests/Zend/Feed/Reader/Integration/WordpressRss2DcAtomTest.php b/tests/Zend/Feed/Reader/Integration/WordpressRss2DcAtomTest.php index 58aa3d6ccc..6c24858f82 100644 --- a/tests/Zend/Feed/Reader/Integration/WordpressRss2DcAtomTest.php +++ b/tests/Zend/Feed/Reader/Integration/WordpressRss2DcAtomTest.php @@ -1,6 +1,6 @@ _feedSamplePath = dirname(__FILE__) . '/_files/wordpress-rss2-dc-atom.xml'; diff --git a/tests/Zend/Feed/ReaderTest.php b/tests/Zend/Feed/ReaderTest.php index 8c5e0e63bf..4f0bafe4e3 100644 --- a/tests/Zend/Feed/ReaderTest.php +++ b/tests/Zend/Feed/ReaderTest.php @@ -1,6 +1,6 @@ _feedSamplePath = dirname(__FILE__) . '/Reader/_files'; } - protected function tearDown(): void + protected function tear_down() { Zend_Feed_Reader::reset(); } diff --git a/tests/Zend/Feed/Writer/DeletedTest.php b/tests/Zend/Feed/Writer/DeletedTest.php index acecae13c2..c144febd85 100644 --- a/tests/Zend/Feed/Writer/DeletedTest.php +++ b/tests/Zend/Feed/Writer/DeletedTest.php @@ -1,6 +1,6 @@ _feedSamplePath = dirname(__FILE__) . '/_files'; } diff --git a/tests/Zend/Feed/Writer/Extension/ITunes/EntryTest.php b/tests/Zend/Feed/Writer/Extension/ITunes/EntryTest.php index 91f1111daf..11e36afb34 100644 --- a/tests/Zend/Feed/Writer/Extension/ITunes/EntryTest.php +++ b/tests/Zend/Feed/Writer/Extension/ITunes/EntryTest.php @@ -1,6 +1,6 @@ _feedSamplePath = dirname(__FILE__) . '/Writer/_files'; } diff --git a/tests/Zend/Feed/Writer/Renderer/Entry/AtomTest.php b/tests/Zend/Feed/Writer/Renderer/Entry/AtomTest.php index 02a9cecb79..86e4d7d387 100644 --- a/tests/Zend/Feed/Writer/Renderer/Entry/AtomTest.php +++ b/tests/Zend/Feed/Writer/Renderer/Entry/AtomTest.php @@ -1,6 +1,6 @@ _validWriter = new Zend_Feed_Writer_Feed(); @@ -64,7 +64,7 @@ protected function setUp(): void $this->_validWriter->addEntry($this->_validEntry); } - protected function tearDown(): void + protected function tear_down() { $this->_validWriter = null; $this->_validEntry = null; diff --git a/tests/Zend/Feed/Writer/Renderer/Entry/RssTest.php b/tests/Zend/Feed/Writer/Renderer/Entry/RssTest.php index 9cd9a6cf79..99fad1fc29 100644 --- a/tests/Zend/Feed/Writer/Renderer/Entry/RssTest.php +++ b/tests/Zend/Feed/Writer/Renderer/Entry/RssTest.php @@ -1,6 +1,6 @@ _validWriter = new Zend_Feed_Writer_Feed(); @@ -58,7 +58,7 @@ protected function setUp(): void $this->_validWriter->addEntry($this->_validEntry); } - protected function tearDown(): void + protected function tear_down() { $this->_validWriter = null; $this->_validEntry = null; diff --git a/tests/Zend/Feed/Writer/Renderer/Feed/AtomTest.php b/tests/Zend/Feed/Writer/Renderer/Feed/AtomTest.php index 0816126f42..139e1e3153 100644 --- a/tests/Zend/Feed/Writer/Renderer/Feed/AtomTest.php +++ b/tests/Zend/Feed/Writer/Renderer/Feed/AtomTest.php @@ -1,6 +1,6 @@ _validWriter = new Zend_Feed_Writer_Feed(); $this->_validWriter->setTitle('This is a test feed.'); @@ -53,7 +53,7 @@ protected function setUp(): void $this->_validWriter->setType('atom'); } - protected function tearDown(): void + protected function tear_down() { $this->_validWriter = null; } diff --git a/tests/Zend/Feed/Writer/Renderer/Feed/RssTest.php b/tests/Zend/Feed/Writer/Renderer/Feed/RssTest.php index 17a27a9ce9..0af0984dd3 100644 --- a/tests/Zend/Feed/Writer/Renderer/Feed/RssTest.php +++ b/tests/Zend/Feed/Writer/Renderer/Feed/RssTest.php @@ -1,6 +1,6 @@ _validWriter = new Zend_Feed_Writer_Feed(); $this->_validWriter->setTitle('This is a test feed.'); @@ -50,7 +50,7 @@ protected function setUp(): void $this->_validWriter->setType('rss'); } - protected function tearDown(): void + protected function tear_down() { $this->_validWriter = null; } diff --git a/tests/Zend/File/AllTests.php b/tests/Zend/File/AllTests.php index 631011d53e..508452de21 100644 --- a/tests/Zend/File/AllTests.php +++ b/tests/Zend/File/AllTests.php @@ -43,7 +43,7 @@ class Zend_File_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_File_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_File_AllTests::main') { Zend_File_AllTests::main(); } diff --git a/tests/Zend/File/ClassFileLocatorTest.php b/tests/Zend/File/ClassFileLocatorTest.php index 130b62ea4d..3b3485c7fe 100644 --- a/tests/Zend/File/ClassFileLocatorTest.php +++ b/tests/Zend/File/ClassFileLocatorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -72,7 +72,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->adapter = new Zend_File_Transfer_Adapter_AbstractTest_MockAdapter(); } @@ -83,7 +83,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -1013,6 +1013,6 @@ public function addInvalidFile() } // Call Zend_File_Transfer_Adapter_AbstractTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_File_Transfer_Adapter_AbstractTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_File_Transfer_Adapter_AbstractTest::main") { Zend_File_Transfer_Adapter_AbstractTest::main(); } diff --git a/tests/Zend/File/Transfer/Adapter/AllTests.php b/tests/Zend/File/Transfer/Adapter/AllTests.php index f5c120c4c3..a71c683adb 100644 --- a/tests/Zend/File/Transfer/Adapter/AllTests.php +++ b/tests/Zend/File/Transfer/Adapter/AllTests.php @@ -43,7 +43,7 @@ class Zend_File_Transfer_Adapter_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_File_Transfer_Adapter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_File_Transfer_Adapter_AllTests::main') { Zend_File_Transfer_Adapter_AllTests::main(); } diff --git a/tests/Zend/File/Transfer/Adapter/HttpTest.php b/tests/Zend/File/Transfer/Adapter/HttpTest.php index d95a1ab2b2..c16cedd542 100644 --- a/tests/Zend/File/Transfer/Adapter/HttpTest.php +++ b/tests/Zend/File/Transfer/Adapter/HttpTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -72,7 +72,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $_FILES = [ 'txt' => [ @@ -90,7 +90,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -364,6 +364,6 @@ public function switchApcToUP() } // Call Zend_File_Transfer_Adapter_HttpTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_File_Transfer_Adapter_HttpTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_File_Transfer_Adapter_HttpTest::main") { Zend_File_Transfer_Adapter_HttpTest::main(); } diff --git a/tests/Zend/File/Transfer/AllTests.php b/tests/Zend/File/Transfer/AllTests.php index 17caadb855..84bef2fbdf 100644 --- a/tests/Zend/File/Transfer/AllTests.php +++ b/tests/Zend/File/Transfer/AllTests.php @@ -42,7 +42,7 @@ class Zend_File_Transfer_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_File_Transfer_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_File_Transfer_AllTests::main') { Zend_File_Transfer_AllTests::main(); } diff --git a/tests/Zend/Filter/AllTests.php b/tests/Zend/Filter/AllTests.php index ef9391b494..41c19461fa 100644 --- a/tests/Zend/Filter/AllTests.php +++ b/tests/Zend/Filter/AllTests.php @@ -107,7 +107,7 @@ class Zend_Filter_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -182,6 +182,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_AllTests::main') { Zend_Filter_AllTests::main(); } diff --git a/tests/Zend/Filter/AlnumTest.php b/tests/Zend/Filter/AlnumTest.php index 68a285326b..23a0bcece0 100644 --- a/tests/Zend/Filter/AlnumTest.php +++ b/tests/Zend/Filter/AlnumTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_Alnum(); if (null === self::$_unicodeEnabled) { diff --git a/tests/Zend/Filter/AlphaTest.php b/tests/Zend/Filter/AlphaTest.php index 2d7025b844..7d9f3d1050 100644 --- a/tests/Zend/Filter/AlphaTest.php +++ b/tests/Zend/Filter/AlphaTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_Alpha(); if (null === self::$_unicodeEnabled) { diff --git a/tests/Zend/Filter/BaseNameTest.php b/tests/Zend/Filter/BaseNameTest.php index 3ab4668636..fe476a4942 100644 --- a/tests/Zend/Filter/BaseNameTest.php +++ b/tests/Zend/Filter/BaseNameTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_BaseName(); } diff --git a/tests/Zend/Filter/BooleanTest.php b/tests/Zend/Filter/BooleanTest.php index 74047dbb18..ced526f7ee 100644 --- a/tests/Zend/Filter/BooleanTest.php +++ b/tests/Zend/Filter/BooleanTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_Boolean(); } diff --git a/tests/Zend/Filter/CallbackTest.php b/tests/Zend/Filter/CallbackTest.php index 65b6680b41..d8a7d8364c 100644 --- a/tests/Zend/Filter/CallbackTest.php +++ b/tests/Zend/Filter/CallbackTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -75,6 +75,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_Compress_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_Compress_AllTests::main') { Zend_Filter_Compress_AllTests::main(); } diff --git a/tests/Zend/Filter/Compress/Bz2Test.php b/tests/Zend/Filter/Compress/Bz2Test.php index aee8905870..1e3df094bc 100644 --- a/tests/Zend/Filter/Compress/Bz2Test.php +++ b/tests/Zend/Filter/Compress/Bz2Test.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!extension_loaded('bz2')) { $this->markTestSkipped('This adapter needs the bz2 extension'); } } - protected function tearDown(): void + protected function tear_down() { if (file_exists(dirname(__FILE__) . '/../_files/compressed.bz2')) { unlink(dirname(__FILE__) . '/../_files/compressed.bz2'); @@ -209,6 +209,6 @@ public function testBz2DecompressArchive() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_Compress_Bz2Test::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_Compress_Bz2Test::main') { Zend_Filter_Compress_Bz2Test::main(); } diff --git a/tests/Zend/Filter/Compress/GzTest.php b/tests/Zend/Filter/Compress/GzTest.php index d0fd7a02c3..2ca7c2ffca 100644 --- a/tests/Zend/Filter/Compress/GzTest.php +++ b/tests/Zend/Filter/Compress/GzTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!extension_loaded('zlib')) { $this->markTestSkipped('This adapter needs the zlib extension'); } } - protected function tearDown(): void + protected function tear_down() { if (file_exists(dirname(__FILE__) . '/../_files/compressed.gz')) { unlink(dirname(__FILE__) . '/../_files/compressed.gz'); @@ -228,6 +228,6 @@ public function testGzToString() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_Compress_GzTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_Compress_GzTest::main') { Zend_Filter_Compress_GzTest::main(); } diff --git a/tests/Zend/Filter/Compress/LzfTest.php b/tests/Zend/Filter/Compress/LzfTest.php index 386623bc97..1d93723a0a 100644 --- a/tests/Zend/Filter/Compress/LzfTest.php +++ b/tests/Zend/Filter/Compress/LzfTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!extension_loaded('lzf')) { $this->markTestSkipped('This adapter needs the lzf extension'); @@ -91,6 +91,6 @@ public function testLzfToString() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_Compress_LzfTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_Compress_LzfTest::main') { Zend_Filter_Compress_LzfTest::main(); } diff --git a/tests/Zend/Filter/Compress/RarTest.php b/tests/Zend/Filter/Compress/RarTest.php index 3626a5f279..1fa420f995 100644 --- a/tests/Zend/Filter/Compress/RarTest.php +++ b/tests/Zend/Filter/Compress/RarTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!extension_loaded('rar')) { $this->markTestSkipped('This adapter needs the rar extension'); @@ -91,7 +91,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { $files = [ dirname(__FILE__) . '/../_files/zipextracted.txt', @@ -341,6 +341,6 @@ public static function rarCompress() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_Compress_RarTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_Compress_RarTest::main') { Zend_Filter_Compress_RarTest::main(); } diff --git a/tests/Zend/Filter/Compress/TarTest.php b/tests/Zend/Filter/Compress/TarTest.php index 972257e832..8a8a143aef 100644 --- a/tests/Zend/Filter/Compress/TarTest.php +++ b/tests/Zend/Filter/Compress/TarTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!class_exists('Archive_Tar')) { require_once 'Zend/Loader.php'; @@ -97,7 +97,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { $files = [ dirname(__FILE__) . '/../_files/zipextracted.txt', @@ -270,6 +270,6 @@ public function testTarToString() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_Compress_TarTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_Compress_TarTest::main') { Zend_Filter_Compress_TarTest::main(); } diff --git a/tests/Zend/Filter/Compress/ZipTest.php b/tests/Zend/Filter/Compress/ZipTest.php index 1a024445ec..b9003ec47b 100644 --- a/tests/Zend/Filter/Compress/ZipTest.php +++ b/tests/Zend/Filter/Compress/ZipTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!extension_loaded('zip')) { $this->markTestSkipped('This adapter needs the zip extension'); @@ -93,7 +93,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { $files = [ dirname(__FILE__) . '/../_files/compressed.zip', @@ -352,6 +352,6 @@ public function testDecompressWillThrowExceptionWhenDetectingUpwardDirectoryTrav } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_Compress_ZipTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_Compress_ZipTest::main') { Zend_Filter_Compress_ZipTest::main(); } diff --git a/tests/Zend/Filter/CompressTest.php b/tests/Zend/Filter/CompressTest.php index 304c74cf11..ad7b2e3f0c 100644 --- a/tests/Zend/Filter/CompressTest.php +++ b/tests/Zend/Filter/CompressTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!extension_loaded('bz2')) { $this->markTestSkipped('This filter is tested with the bz2 extension'); } } - protected function tearDown(): void + protected function tear_down() { if (file_exists(dirname(__FILE__) . '/../_files/compressed.bz2')) { unlink(dirname(__FILE__) . '/../_files/compressed.bz2'); @@ -273,6 +273,6 @@ public function testInvalidMethod() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_CompressTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_CompressTest::main') { Zend_Filter_CompressTest::main(); } diff --git a/tests/Zend/Filter/DecompressTest.php b/tests/Zend/Filter/DecompressTest.php index 04ea104c18..cb39543327 100644 --- a/tests/Zend/Filter/DecompressTest.php +++ b/tests/Zend/Filter/DecompressTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!extension_loaded('bz2')) { $this->markTestSkipped('This filter is tested with the bz2 extension'); } } - protected function tearDown(): void + protected function tear_down() { if (file_exists(dirname(__FILE__) . '/../_files/compressed.bz2')) { unlink(dirname(__FILE__) . '/../_files/compressed.bz2'); @@ -130,6 +130,6 @@ public function testDecompressArchive() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_DecompressTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_DecompressTest::main') { Zend_Filter_DecompressTest::main(); } diff --git a/tests/Zend/Filter/DecryptTest.php b/tests/Zend/Filter/DecryptTest.php index 2da851a2ca..6f11abf673 100644 --- a/tests/Zend/Filter/DecryptTest.php +++ b/tests/Zend/Filter/DecryptTest.php @@ -1,6 +1,6 @@ markTestSkipped('This filter needs the mcrypt or openssl extension'); diff --git a/tests/Zend/Filter/DigitsTest.php b/tests/Zend/Filter/DigitsTest.php index 40e7a0a2bd..ebbb550868 100644 --- a/tests/Zend/Filter/DigitsTest.php +++ b/tests/Zend/Filter/DigitsTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_Digits(); if (null === self::$_unicodeEnabled) { diff --git a/tests/Zend/Filter/DirTest.php b/tests/Zend/Filter/DirTest.php index aa8a5dfd56..7c8d714dd1 100644 --- a/tests/Zend/Filter/DirTest.php +++ b/tests/Zend/Filter/DirTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_Dir(); } diff --git a/tests/Zend/Filter/Encrypt/AllTests.php b/tests/Zend/Filter/Encrypt/AllTests.php index d16923678f..6a9d829904 100644 --- a/tests/Zend/Filter/Encrypt/AllTests.php +++ b/tests/Zend/Filter/Encrypt/AllTests.php @@ -48,7 +48,7 @@ class Zend_Filter_Encrypt_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -67,6 +67,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_Encrypt_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_Encrypt_AllTests::main') { Zend_Filter_Encrypt_AllTests::main(); } diff --git a/tests/Zend/Filter/Encrypt/McryptTest.php b/tests/Zend/Filter/Encrypt/McryptTest.php index ef258acbc2..e0f84ab075 100644 --- a/tests/Zend/Filter/Encrypt/McryptTest.php +++ b/tests/Zend/Filter/Encrypt/McryptTest.php @@ -1,6 +1,6 @@ markTestSkipped('This adapter needs the mcrypt extension'); diff --git a/tests/Zend/Filter/Encrypt/OpensslTest.php b/tests/Zend/Filter/Encrypt/OpensslTest.php index 8a267fbe90..ab5e882d79 100644 --- a/tests/Zend/Filter/Encrypt/OpensslTest.php +++ b/tests/Zend/Filter/Encrypt/OpensslTest.php @@ -1,6 +1,6 @@ = 8) so need php anotation bellow - * @requires PHP < 8.0 */ class Zend_Filter_Encrypt_OpensslTest extends TestCase { - protected function setUp(): void + protected function set_up() { if (!extension_loaded('openssl')) { $this->markTestSkipped('This filter needs the openssl extension'); } + if (!in_array('rc4', openssl_get_cipher_methods(), true)) { + $this->markTestSkipped('This filter needs a version of OpenSSL that supports the RC4 cipher'); + } + if (empty(array_intersect(['md5', 'md5-rsa'], openssl_get_md_methods()))) { + $this->markTestSkipped('The keys used by this test need a version of OpenSSL that supports MD5 and MD5-RSA as message digest'); + } } /** @@ -54,6 +58,10 @@ protected function setUp(): void */ public function testBasicOpenssl() { + while (openssl_error_string()) { + // Clear any openssl errors + } + $filter = new Zend_Filter_Encrypt_Openssl(dirname(__FILE__) . '/../_files/publickey.pem'); $valuesExpected = [ 'STRING' => 'STRING', @@ -64,7 +72,7 @@ public function testBasicOpenssl() $key = $filter->getPublicKey(); $this->assertEquals( [dirname(__FILE__) . '/../_files/publickey.pem' => - '-----BEGIN CERTIFICATE----- + '-----BEGIN CERTIFICATE----- MIIC3jCCAkegAwIBAgIBADANBgkqhkiG9w0BAQQFADCBtDELMAkGA1UEBhMCTkwx FjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEDAOBgNVBAcTB1phYW5kYW0xFzAVBgNV BAoTDk1vYmlsZWZpc2guY29tMR8wHQYDVQQLExZDZXJ0aWZpY2F0aW9uIFNlcnZp diff --git a/tests/Zend/Filter/EncryptTest.php b/tests/Zend/Filter/EncryptTest.php index 243e2db278..92bfb5c35a 100644 --- a/tests/Zend/Filter/EncryptTest.php +++ b/tests/Zend/Filter/EncryptTest.php @@ -1,6 +1,6 @@ markTestSkipped('This filter needs the mcrypt or openssl extension'); diff --git a/tests/Zend/Filter/File/AllTests.php b/tests/Zend/Filter/File/AllTests.php index 6df98d02c0..8ccc2993f2 100644 --- a/tests/Zend/Filter/File/AllTests.php +++ b/tests/Zend/Filter/File/AllTests.php @@ -51,7 +51,7 @@ class Zend_Filter_File_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -73,6 +73,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_File_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_File_AllTests::main') { Zend_Filter_File_AllTests::main(); } diff --git a/tests/Zend/Filter/File/DecryptTest.php b/tests/Zend/Filter/File/DecryptTest.php index bcfab9f037..138c812a87 100644 --- a/tests/Zend/Filter/File/DecryptTest.php +++ b/tests/Zend/Filter/File/DecryptTest.php @@ -1,6 +1,6 @@ markTestSkipped('This filter needs the mcrypt extension'); @@ -58,7 +58,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { if (file_exists(dirname(__FILE__) . '/../_files/newencryption.txt')) { unlink(dirname(__FILE__) . '/../_files/newencryption.txt'); diff --git a/tests/Zend/Filter/File/EncryptTest.php b/tests/Zend/Filter/File/EncryptTest.php index 13bb3eb077..2692113f14 100644 --- a/tests/Zend/Filter/File/EncryptTest.php +++ b/tests/Zend/Filter/File/EncryptTest.php @@ -1,6 +1,6 @@ markTestSkipped('This filter needs the mcrypt extension'); @@ -54,7 +54,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { if (file_exists(dirname(__FILE__) . '/../_files/newencryption.txt')) { unlink(dirname(__FILE__) . '/../_files/newencryption.txt'); diff --git a/tests/Zend/Filter/File/LowerCaseTest.php b/tests/Zend/Filter/File/LowerCaseTest.php index 6e035f6878..b4d0036e62 100644 --- a/tests/Zend/Filter/File/LowerCaseTest.php +++ b/tests/Zend/Filter/File/LowerCaseTest.php @@ -1,6 +1,6 @@ _filesPath = dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; @@ -81,7 +81,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { if (file_exists($this->_newFile)) { unlink($this->_newFile); @@ -115,6 +115,7 @@ public function testFileNotFoundException() /** * @return void + * @requires extension mbstring */ public function testCheckSettingOfEncodingInIstance() { @@ -130,6 +131,7 @@ public function testCheckSettingOfEncodingInIstance() /** * @return void + * @requires extension mbstring */ public function testCheckSettingOfEncodingWithMethod() { diff --git a/tests/Zend/Filter/File/RenameTest.php b/tests/Zend/Filter/File/RenameTest.php index 024ae889df..feecfc50d2 100644 --- a/tests/Zend/Filter/File/RenameTest.php +++ b/tests/Zend/Filter/File/RenameTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -102,7 +102,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->_filesPath = dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; @@ -132,7 +132,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { if (!file_exists($this->_oldFile)) { copy($this->_origFile, $this->_oldFile); @@ -467,6 +467,6 @@ public function testInvalidContruction() } } -if (PHPUnit_MAIN_METHOD == "Zend_Filter_File_RenameTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_File_RenameTest::main") { Zend_Filter_File_RenameTest::main(); } diff --git a/tests/Zend/Filter/File/UpperCaseTest.php b/tests/Zend/Filter/File/UpperCaseTest.php index 72b1edce0f..6036511727 100644 --- a/tests/Zend/Filter/File/UpperCaseTest.php +++ b/tests/Zend/Filter/File/UpperCaseTest.php @@ -1,6 +1,6 @@ _filesPath = dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; @@ -81,7 +81,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { if (file_exists($this->_newFile)) { unlink($this->_newFile); @@ -115,6 +115,7 @@ public function testFileNotFoundException() /** * @return void + * @requires extension mbstring */ public function testCheckSettingOfEncodingInIstance() { @@ -130,6 +131,7 @@ public function testCheckSettingOfEncodingInIstance() /** * @return void + * @requires extension mbstring */ public function testCheckSettingOfEncodingWithMethod() { diff --git a/tests/Zend/Filter/HtmlEntitiesTest.php b/tests/Zend/Filter/HtmlEntitiesTest.php index 57063505de..0b1d0c3ec9 100644 --- a/tests/Zend/Filter/HtmlEntitiesTest.php +++ b/tests/Zend/Filter/HtmlEntitiesTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_HtmlEntities(); } diff --git a/tests/Zend/Filter/InflectorTest.php b/tests/Zend/Filter/InflectorTest.php index fc71c52d4e..2247733060 100644 --- a/tests/Zend/Filter/InflectorTest.php +++ b/tests/Zend/Filter/InflectorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -86,7 +86,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->inflector = new Zend_Filter_Inflector(); $this->loader = $this->inflector->getPluginLoader(); @@ -98,7 +98,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { $this->loader->clearPaths(); } @@ -563,6 +563,6 @@ public function testPassingZendConfigObjectToSetConfigSetsStateAndRules() } // Call Zend_Filter_InflectorTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_InflectorTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_InflectorTest::main') { Zend_Filter_InflectorTest::main(); } diff --git a/tests/Zend/Filter/InputTest.php b/tests/Zend/Filter/InputTest.php index cc0400fefa..da57724994 100644 --- a/tests/Zend/Filter/InputTest.php +++ b/tests/Zend/Filter/InputTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_Int(); } diff --git a/tests/Zend/Filter/LocalizedToNormalizedTest.php b/tests/Zend/Filter/LocalizedToNormalizedTest.php index 471a486ac8..015c7d3392 100644 --- a/tests/Zend/Filter/LocalizedToNormalizedTest.php +++ b/tests/Zend/Filter/LocalizedToNormalizedTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_Null(); } diff --git a/tests/Zend/Filter/PregReplaceTest.php b/tests/Zend/Filter/PregReplaceTest.php index 158cd622af..ff40d3532d 100644 --- a/tests/Zend/Filter/PregReplaceTest.php +++ b/tests/Zend/Filter/PregReplaceTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->filter = new Zend_Filter_PregReplace(); } @@ -156,6 +156,6 @@ class XPregReplace extends Zend_Filter_PregReplace } // Call Zend_Filter_PregReplaceTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_PregReplaceTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_PregReplaceTest::main') { Zend_Filter_PregReplaceTest::main(); } diff --git a/tests/Zend/Filter/RealPathTest.php b/tests/Zend/Filter/RealPathTest.php index e38f19a789..54da006354 100644 --- a/tests/Zend/Filter/RealPathTest.php +++ b/tests/Zend/Filter/RealPathTest.php @@ -1,6 +1,6 @@ _filesPath = dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files'; $this->_filter = new Zend_Filter_RealPath(); diff --git a/tests/Zend/Filter/StringToLowerTest.php b/tests/Zend/Filter/StringToLowerTest.php index 03452988a0..ea5928ee6f 100644 --- a/tests/Zend/Filter/StringToLowerTest.php +++ b/tests/Zend/Filter/StringToLowerTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_StringToLower(); } diff --git a/tests/Zend/Filter/StringToUpperTest.php b/tests/Zend/Filter/StringToUpperTest.php index 5a7233965e..cc205fefc9 100644 --- a/tests/Zend/Filter/StringToUpperTest.php +++ b/tests/Zend/Filter/StringToUpperTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_StringToUpper(); } diff --git a/tests/Zend/Filter/StringTrimTest.php b/tests/Zend/Filter/StringTrimTest.php index d0aadc22c0..317beefaf5 100644 --- a/tests/Zend/Filter/StringTrimTest.php +++ b/tests/Zend/Filter/StringTrimTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_StringTrim(); } diff --git a/tests/Zend/Filter/StripNewlinesTest.php b/tests/Zend/Filter/StripNewlinesTest.php index 8fe8db6c49..5f391bb8cc 100644 --- a/tests/Zend/Filter/StripNewlinesTest.php +++ b/tests/Zend/Filter/StripNewlinesTest.php @@ -1,6 +1,6 @@ _filter = new Zend_Filter_StripNewlines(); } diff --git a/tests/Zend/Filter/StripTagsTest.php b/tests/Zend/Filter/StripTagsTest.php index c3a5b9133c..28adbecb46 100644 --- a/tests/Zend/Filter/StripTagsTest.php +++ b/tests/Zend/Filter/StripTagsTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -69,7 +69,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->_filter = new Zend_Filter_StripTags(); } diff --git a/tests/Zend/Filter/Word/AllTests.php b/tests/Zend/Filter/Word/AllTests.php index cdecb226b1..8b100d55bb 100644 --- a/tests/Zend/Filter/Word/AllTests.php +++ b/tests/Zend/Filter/Word/AllTests.php @@ -58,7 +58,7 @@ class Zend_Filter_Word_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -87,6 +87,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Filter_Word_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Filter_Word_AllTests::main') { Zend_Filter_Word_AllTests::main(); } diff --git a/tests/Zend/Filter/Word/CamelCaseToDashTest.php b/tests/Zend/Filter/Word/CamelCaseToDashTest.php index 7bac94ca8f..bf7be4098c 100644 --- a/tests/Zend/Filter/Word/CamelCaseToDashTest.php +++ b/tests/Zend/Filter/Word/CamelCaseToDashTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesCamelCasedWordsWithDashes() @@ -69,6 +69,6 @@ public function testFilterSeparatesCamelCasedWordsWithDashes() } // Call Zend_Filter_Word_CamelCaseToDashTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_CamelCaseToDashTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_CamelCaseToDashTest::main") { Zend_Filter_Word_CamelCaseToDashTest::main(); } diff --git a/tests/Zend/Filter/Word/CamelCaseToSeparatorTest.php b/tests/Zend/Filter/Word/CamelCaseToSeparatorTest.php index a7c9e4390a..be2fb8de64 100644 --- a/tests/Zend/Filter/Word/CamelCaseToSeparatorTest.php +++ b/tests/Zend/Filter/Word/CamelCaseToSeparatorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesCamelCasedWordsWithSpacesByDefault() @@ -79,6 +79,6 @@ public function testFilterSeparatesCamelCasedWordsWithProvidedSeparator() } // Call Zend_Filter_Word_CamelCaseToSeparatorTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_CamelCaseToSeparatorTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_CamelCaseToSeparatorTest::main") { Zend_Filter_Word_CamelCaseToSeparatorTest::main(); } diff --git a/tests/Zend/Filter/Word/CamelCaseToUnderscoreTest.php b/tests/Zend/Filter/Word/CamelCaseToUnderscoreTest.php index ef078a32f0..36084f5de5 100644 --- a/tests/Zend/Filter/Word/CamelCaseToUnderscoreTest.php +++ b/tests/Zend/Filter/Word/CamelCaseToUnderscoreTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesCamelCasedWordsWithUnderscores() @@ -93,6 +93,6 @@ public function testFilterSeperatingNumbersToUnterscore() } // Call Zend_Filter_Word_CamelCaseToUnderscoreTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_CamelCaseToUnderscoreTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_CamelCaseToUnderscoreTest::main") { Zend_Filter_Word_CamelCaseToUnderscoreTest::main(); } diff --git a/tests/Zend/Filter/Word/DashToCamelCaseTest.php b/tests/Zend/Filter/Word/DashToCamelCaseTest.php index fe59b856fb..301dab5b9d 100644 --- a/tests/Zend/Filter/Word/DashToCamelCaseTest.php +++ b/tests/Zend/Filter/Word/DashToCamelCaseTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesCamelCasedWordsWithDashes() @@ -69,6 +69,6 @@ public function testFilterSeparatesCamelCasedWordsWithDashes() } // Call Zend_Filter_Word_DashToCamelCaseTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_DashToCamelCaseTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_DashToCamelCaseTest::main") { Zend_Filter_Word_DashToCamelCaseTest::main(); } diff --git a/tests/Zend/Filter/Word/DashToSeparatorTest.php b/tests/Zend/Filter/Word/DashToSeparatorTest.php index 11f677ffc7..466889b472 100644 --- a/tests/Zend/Filter/Word/DashToSeparatorTest.php +++ b/tests/Zend/Filter/Word/DashToSeparatorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesDashedWordsWithDefaultSpaces() @@ -79,6 +79,6 @@ public function testFilterSeparatesDashedWordsWithSomeString() } // Call Zend_Filter_Word_DashToSeparatorTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_DashToSeparatorTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_DashToSeparatorTest::main") { Zend_Filter_Word_DashToSeparatorTest::main(); } diff --git a/tests/Zend/Filter/Word/DashToUnderscoreTest.php b/tests/Zend/Filter/Word/DashToUnderscoreTest.php index f8f49d4c67..1368e9d559 100644 --- a/tests/Zend/Filter/Word/DashToUnderscoreTest.php +++ b/tests/Zend/Filter/Word/DashToUnderscoreTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesCamelCasedWordsWithDashes() @@ -69,6 +69,6 @@ public function testFilterSeparatesCamelCasedWordsWithDashes() } // Call Zend_Filter_Word_DashToUnderscoreTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_DashToUnderscoreTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_DashToUnderscoreTest::main") { Zend_Filter_Word_DashToUnderscoreTest::main(); } diff --git a/tests/Zend/Filter/Word/SeparatorToCamelCaseTest.php b/tests/Zend/Filter/Word/SeparatorToCamelCaseTest.php index e1770bc987..3dfdac2da4 100644 --- a/tests/Zend/Filter/Word/SeparatorToCamelCaseTest.php +++ b/tests/Zend/Filter/Word/SeparatorToCamelCaseTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesCamelCasedWordsWithSpacesByDefault() @@ -79,6 +79,6 @@ public function testFilterSeparatesCamelCasedWordsWithProvidedSeparator() } // Call Zend_Filter_Word_SeparatorToCamelCaseTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_SeparatorToCamelCaseTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_SeparatorToCamelCaseTest::main") { Zend_Filter_Word_SeparatorToCamelCaseTest::main(); } diff --git a/tests/Zend/Filter/Word/SeparatorToDashTest.php b/tests/Zend/Filter/Word/SeparatorToDashTest.php index 4afff8f575..48529dfd93 100644 --- a/tests/Zend/Filter/Word/SeparatorToDashTest.php +++ b/tests/Zend/Filter/Word/SeparatorToDashTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesDashedWordsWithDefaultSpaces() @@ -79,6 +79,6 @@ public function testFilterSeparatesDashedWordsWithSomeString() } // Call Zend_Filter_Word_SeparatorToDashTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_SeparatorToDashTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_SeparatorToDashTest::main") { Zend_Filter_Word_SeparatorToDashTest::main(); } diff --git a/tests/Zend/Filter/Word/SeparatorToSeparatorTest.php b/tests/Zend/Filter/Word/SeparatorToSeparatorTest.php index 50561bbc68..b7336af4c6 100644 --- a/tests/Zend/Filter/Word/SeparatorToSeparatorTest.php +++ b/tests/Zend/Filter/Word/SeparatorToSeparatorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesWordsByDefault() @@ -89,6 +89,6 @@ public function testFilterSeparatesWordsWithSearchAndReplacementSpecified() } // Call Zend_Filter_Word_SeparatorToSeparatorTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_SeparatorToSeparatorTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_SeparatorToSeparatorTest::main") { Zend_Filter_Word_SeparatorToSeparatorTest::main(); } diff --git a/tests/Zend/Filter/Word/UnderscoreToCamelCaseTest.php b/tests/Zend/Filter/Word/UnderscoreToCamelCaseTest.php index 7d6bb2077d..47918849b1 100644 --- a/tests/Zend/Filter/Word/UnderscoreToCamelCaseTest.php +++ b/tests/Zend/Filter/Word/UnderscoreToCamelCaseTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesCamelCasedWordsWithDashes() @@ -107,6 +107,6 @@ public function testSomeFilterValues() } // Call Zend_Filter_Word_UnderscoreToCamelCaseTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_UnderscoreToCamelCaseTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_UnderscoreToCamelCaseTest::main") { Zend_Filter_Word_UnderscoreToCamelCaseTest::main(); } diff --git a/tests/Zend/Filter/Word/UnderscoreToDashTest.php b/tests/Zend/Filter/Word/UnderscoreToDashTest.php index c508c06ceb..aaf05ba619 100644 --- a/tests/Zend/Filter/Word/UnderscoreToDashTest.php +++ b/tests/Zend/Filter/Word/UnderscoreToDashTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesCamelCasedWordsWithDashes() @@ -69,6 +69,6 @@ public function testFilterSeparatesCamelCasedWordsWithDashes() } // Call Zend_Filter_Word_UnderscoreToDashTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_UnderscoreToDashTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_UnderscoreToDashTest::main") { Zend_Filter_Word_UnderscoreToDashTest::main(); } diff --git a/tests/Zend/Filter/Word/UnderscoreToSeparatorTest.php b/tests/Zend/Filter/Word/UnderscoreToSeparatorTest.php index a4f98378ac..06856859b5 100644 --- a/tests/Zend/Filter/Word/UnderscoreToSeparatorTest.php +++ b/tests/Zend/Filter/Word/UnderscoreToSeparatorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFilterSeparatesCamelCasedWordsDefaultSeparator() @@ -79,6 +79,6 @@ public function testFilterSeparatesCamelCasedWordsProvidedSeparator() } // Call Zend_Filter_Word_UnderscoreToSeparatorTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Filter_Word_UnderscoreToSeparatorTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Filter_Word_UnderscoreToSeparatorTest::main") { Zend_Filter_Word_UnderscoreToSeparatorTest::main(); } diff --git a/tests/Zend/FilterTest.php b/tests/Zend/FilterTest.php index 2c5379c239..38aa7cd172 100644 --- a/tests/Zend/FilterTest.php +++ b/tests/Zend/FilterTest.php @@ -1,6 +1,6 @@ error = null; $this->_filter = new Zend_Filter(); @@ -72,7 +72,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { Zend_Filter::setDefaultNamespaces([]); } diff --git a/tests/Zend/Form/AllTests.php b/tests/Zend/Form/AllTests.php index e91488a3f1..66c75b001c 100644 --- a/tests/Zend/Form/AllTests.php +++ b/tests/Zend/Form/AllTests.php @@ -47,7 +47,7 @@ class Zend_Form_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -65,6 +65,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Form_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Form_AllTests::main') { Zend_Form_AllTests::main(); } diff --git a/tests/Zend/Form/Decorator/AbstractTest.php b/tests/Zend/Form/Decorator/AbstractTest.php index a07d65d1da..b85163da2d 100644 --- a/tests/Zend/Form/Decorator/AbstractTest.php +++ b/tests/Zend/Form/Decorator/AbstractTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_Errors(); } @@ -85,7 +85,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -201,6 +201,6 @@ public function testCanClearAllOptions() } // Call Zend_Form_Decorator_AbstractTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_AbstractTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_AbstractTest::main") { Zend_Form_Decorator_AbstractTest::main(); } diff --git a/tests/Zend/Form/Decorator/AllTests.php b/tests/Zend/Form/Decorator/AllTests.php index f14d5bc555..b4edc4c870 100644 --- a/tests/Zend/Form/Decorator/AllTests.php +++ b/tests/Zend/Form/Decorator/AllTests.php @@ -55,7 +55,7 @@ class Zend_Form_Decorator_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -81,6 +81,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Form_Decorator_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Form_Decorator_AllTests::main') { Zend_Form_Decorator_AllTests::main(); } diff --git a/tests/Zend/Form/Decorator/CallbackTest.php b/tests/Zend/Form/Decorator/CallbackTest.php index 2c0e8c28f8..e334ebf4e1 100644 --- a/tests/Zend/Form/Decorator/CallbackTest.php +++ b/tests/Zend/Form/Decorator/CallbackTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -67,7 +67,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_Callback(); } @@ -78,7 +78,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -227,6 +227,6 @@ public static function direct($content, $element, array $options) } // Call Zend_Form_Decorator_CallbackTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_CallbackTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_CallbackTest::main") { Zend_Form_Decorator_CallbackTest::main(); } diff --git a/tests/Zend/Form/Decorator/DescriptionTest.php b/tests/Zend/Form/Decorator/DescriptionTest.php index a3e05c542c..0e2f97a189 100644 --- a/tests/Zend/Form/Decorator/DescriptionTest.php +++ b/tests/Zend/Form/Decorator/DescriptionTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -79,7 +79,7 @@ public static function main() * * @return void */ - public function setUp(): void + public function set_up() { if (isset($this->html)) { unset($this->html); @@ -98,7 +98,7 @@ public function setUp(): void * * @return void */ - public function tearDown(): void + public function tear_down() { } @@ -237,6 +237,6 @@ public function testDescriptionIsNotTranslatedTwice() } // Call Zend_Form_Decorator_DescriptionTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_DescriptionTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_DescriptionTest::main") { Zend_Form_Decorator_DescriptionTest::main(); } diff --git a/tests/Zend/Form/Decorator/ErrorsTest.php b/tests/Zend/Form/Decorator/ErrorsTest.php index 88a06581ab..9b949b5125 100644 --- a/tests/Zend/Form/Decorator/ErrorsTest.php +++ b/tests/Zend/Form/Decorator/ErrorsTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -75,7 +75,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_Errors(); } @@ -86,7 +86,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -231,6 +231,6 @@ public function testRenderingWithSubFormAsElement() } // Call Zend_Form_Decorator_ErrorsTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_ErrorsTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_ErrorsTest::main") { Zend_Form_Decorator_ErrorsTest::main(); } diff --git a/tests/Zend/Form/Decorator/FieldsetTest.php b/tests/Zend/Form/Decorator/FieldsetTest.php index ce2965f5fb..7ef851654f 100644 --- a/tests/Zend/Form/Decorator/FieldsetTest.php +++ b/tests/Zend/Form/Decorator/FieldsetTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -70,7 +70,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_Fieldset(); } @@ -81,7 +81,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -269,6 +269,6 @@ public function testFormIdOverridesFieldsetId() } // Call Zend_Form_Decorator_FieldsetTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_FieldsetTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_FieldsetTest::main") { Zend_Form_Decorator_FieldsetTest::main(); } diff --git a/tests/Zend/Form/Decorator/FileTest.php b/tests/Zend/Form/Decorator/FileTest.php index 5b3096f8a3..dc6563f805 100644 --- a/tests/Zend/Form/Decorator/FileTest.php +++ b/tests/Zend/Form/Decorator/FileTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -75,7 +75,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_File(); } @@ -86,7 +86,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -238,6 +238,6 @@ public function formFileMock($name, $attribs = null) } // Call Zend_Form_Decorator_FileTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_FileTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_FileTest::main") { Zend_Form_Decorator_FileTest::main(); } diff --git a/tests/Zend/Form/Decorator/FormErrorsTest.php b/tests/Zend/Form/Decorator/FormErrorsTest.php index 4d21b67d40..60754f1212 100644 --- a/tests/Zend/Form/Decorator/FormErrorsTest.php +++ b/tests/Zend/Form/Decorator/FormErrorsTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -75,7 +75,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_FormErrors(); } @@ -86,7 +86,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -425,6 +425,6 @@ public function markupOptionMethodsProvider() } // Call Zend_Form_Decorator_FormErrorsTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_FormErrorsTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_FormErrorsTest::main") { Zend_Form_Decorator_FormErrorsTest::main(); } diff --git a/tests/Zend/Form/Decorator/FormTest.php b/tests/Zend/Form/Decorator/FormTest.php index 2c2f4e409a..c780953ae7 100644 --- a/tests/Zend/Form/Decorator/FormTest.php +++ b/tests/Zend/Form/Decorator/FormTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_Form(); } @@ -79,7 +79,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -145,6 +145,6 @@ public function testEmptyFormNameShouldNotRenderEmptyFormId() } // Call Zend_Form_Decorator_FormTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_FormTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_FormTest::main") { Zend_Form_Decorator_FormTest::main(); } diff --git a/tests/Zend/Form/Decorator/HtmlTagTest.php b/tests/Zend/Form/Decorator/HtmlTagTest.php index adb915ed04..57ee5b1b52 100644 --- a/tests/Zend/Form/Decorator/HtmlTagTest.php +++ b/tests/Zend/Form/Decorator/HtmlTagTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -69,7 +69,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_HtmlTag(); } @@ -80,7 +80,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -246,6 +246,6 @@ public function testCanSetTagViaOption() } // Call Zend_Form_Decorator_HtmlTagTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_HtmlTagTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_HtmlTagTest::main") { Zend_Form_Decorator_HtmlTagTest::main(); } diff --git a/tests/Zend/Form/Decorator/ImageTest.php b/tests/Zend/Form/Decorator/ImageTest.php index 623664cda4..5abdf7eb41 100644 --- a/tests/Zend/Form/Decorator/ImageTest.php +++ b/tests/Zend/Form/Decorator/ImageTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -71,7 +71,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_Image(); } @@ -82,7 +82,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -184,6 +184,6 @@ public function testImageElementAttributesPassedWithDecoratorOptionsToViewHelper } // Call Zend_Form_Decorator_ImageTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_ImageTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_ImageTest::main") { Zend_Form_Decorator_ImageTest::main(); } diff --git a/tests/Zend/Form/Decorator/LabelTest.php b/tests/Zend/Form/Decorator/LabelTest.php index 0dddcc7b06..2967c02149 100644 --- a/tests/Zend/Form/Decorator/LabelTest.php +++ b/tests/Zend/Form/Decorator/LabelTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -71,7 +71,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_Label(); } @@ -82,7 +82,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -440,6 +440,6 @@ public function testLabelIsNotTranslatedTwice() } // Call Zend_Form_Decorator_LabelTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_LabelTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_LabelTest::main") { Zend_Form_Decorator_LabelTest::main(); } diff --git a/tests/Zend/Form/Decorator/PrepareElementsTest.php b/tests/Zend/Form/Decorator/PrepareElementsTest.php index 4c2a09bf64..42baa17bd2 100644 --- a/tests/Zend/Form/Decorator/PrepareElementsTest.php +++ b/tests/Zend/Form/Decorator/PrepareElementsTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->form = new Zend_Form(); $this->form->setDecorators(['PrepareElements']); @@ -87,7 +87,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -165,6 +165,6 @@ public function testEachElementShouldHaveUpdatedTranslatorProperty() } // Call Zend_Form_Decorator_PrepareElementsTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_PrepareElementsTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_PrepareElementsTest::main") { Zend_Form_Decorator_PrepareElementsTest::main(); } diff --git a/tests/Zend/Form/Decorator/ReCaptchaTest.php b/tests/Zend/Form/Decorator/ReCaptchaTest.php index fadee7cdeb..de622bdf99 100644 --- a/tests/Zend/Form/Decorator/ReCaptchaTest.php +++ b/tests/Zend/Form/Decorator/ReCaptchaTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,7 +73,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $view = new Zend_View(); $this->element = new Zend_Form_Element_Captcha('captcha', [ @@ -141,6 +141,6 @@ public function testDecoratorUsesNamespacedIdsInJavascriptOnSubmitHandler() } // Call Zend_Form_Decorator_ReCaptchaTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_ReCaptchaTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_ReCaptchaTest::main") { Zend_Form_Decorator_ReCaptchaTest::main(); } diff --git a/tests/Zend/Form/Decorator/ViewHelperTest.php b/tests/Zend/Form/Decorator/ViewHelperTest.php index d0e3c4f16a..177d522842 100644 --- a/tests/Zend/Form/Decorator/ViewHelperTest.php +++ b/tests/Zend/Form/Decorator/ViewHelperTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -70,7 +70,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_ViewHelper(); } @@ -81,7 +81,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -309,6 +309,6 @@ public function __construct($name, $options = null) } // Call Zend_Form_Decorator_ViewHelperTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_ViewHelperTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_ViewHelperTest::main") { Zend_Form_Decorator_ViewHelperTest::main(); } diff --git a/tests/Zend/Form/Decorator/ViewScriptTest.php b/tests/Zend/Form/Decorator/ViewScriptTest.php index beb55a1ad2..ae494d7d1c 100644 --- a/tests/Zend/Form/Decorator/ViewScriptTest.php +++ b/tests/Zend/Form/Decorator/ViewScriptTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -70,7 +70,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->decorator = new Zend_Form_Decorator_ViewScript(); } @@ -81,7 +81,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -250,6 +250,6 @@ public function testRenderingWithoutHelperInAttribs() } // Call Zend_Form_Decorator_ViewScriptTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Decorator_ViewScriptTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Decorator_ViewScriptTest::main") { Zend_Form_Decorator_ViewScriptTest::main(); } diff --git a/tests/Zend/Form/DisplayGroupTest.php b/tests/Zend/Form/DisplayGroupTest.php index c8cd97e6c2..5b902d615a 100644 --- a/tests/Zend/Form/DisplayGroupTest.php +++ b/tests/Zend/Form/DisplayGroupTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Form::setDefaultTranslator(null); @@ -93,7 +93,7 @@ protected function setUp(): void ); } - protected function tearDown(): void + protected function tear_down() { } @@ -865,6 +865,6 @@ public function init() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Form_DisplayGroupTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Form_DisplayGroupTest::main') { Zend_Form_DisplayGroupTest::main(); } diff --git a/tests/Zend/Form/Element/AllTests.php b/tests/Zend/Form/Element/AllTests.php index ec82d8b7d4..4205e5ef10 100644 --- a/tests/Zend/Form/Element/AllTests.php +++ b/tests/Zend/Form/Element/AllTests.php @@ -58,7 +58,7 @@ class Zend_Form_Element_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -87,6 +87,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Form_Element_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Form_Element_AllTests::main') { Zend_Form_Element_AllTests::main(); } diff --git a/tests/Zend/Form/Element/ButtonTest.php b/tests/Zend/Form/Element/ButtonTest.php index 2a6e40db40..98f202507a 100644 --- a/tests/Zend/Form/Element/ButtonTest.php +++ b/tests/Zend/Form/Element/ButtonTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -67,7 +67,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Button('foo'); } @@ -78,7 +78,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -209,6 +209,6 @@ protected function _checkZf2794() } // Call Zend_Form_Element_ButtonTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_ButtonTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_ButtonTest::main") { Zend_Form_Element_ButtonTest::main(); } diff --git a/tests/Zend/Form/Element/CaptchaTest.php b/tests/Zend/Form/Element/CaptchaTest.php index 6f4c2eb2d6..1f65cd569b 100644 --- a/tests/Zend/Form/Element/CaptchaTest.php +++ b/tests/Zend/Form/Element/CaptchaTest.php @@ -1,6 +1,6 @@ run($suite); + (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Captcha( 'foo', @@ -253,7 +253,7 @@ public function testDefaultDecoratorsBeforeAndAfterRendering() */ // Reset element - $this->setUp(); + $this->set_up(); $options = [ 'privKey' => 'privateKey', @@ -510,6 +510,6 @@ public function __call($method, $args) } // Call Zend_Form_Element_CaptchaTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_CaptchaTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_CaptchaTest::main") { Zend_Form_Element_CaptchaTest::main(); } diff --git a/tests/Zend/Form/Element/CheckboxTest.php b/tests/Zend/Form/Element/CheckboxTest.php index 4cbb68fbbc..e1c95583a2 100644 --- a/tests/Zend/Form/Element/CheckboxTest.php +++ b/tests/Zend/Form/Element/CheckboxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -66,7 +66,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Checkbox('foo'); } @@ -77,7 +77,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -267,6 +267,6 @@ protected function _checkZf2794() } // Call Zend_Form_Element_CheckboxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_CheckboxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_CheckboxTest::main") { Zend_Form_Element_CheckboxTest::main(); } diff --git a/tests/Zend/Form/Element/FileTest.php b/tests/Zend/Form/Element/FileTest.php index 2070531e9e..e66d68e2f3 100644 --- a/tests/Zend/Form/Element/FileTest.php +++ b/tests/Zend/Form/Element/FileTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -77,7 +77,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Form::setDefaultTranslator(null); @@ -90,7 +90,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -687,6 +687,6 @@ public static function getProgress() } // Call Zend_Form_Element_FileTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_FileTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_FileTest::main") { Zend_Form_Element_FileTest::main(); } diff --git a/tests/Zend/Form/Element/HashTest.php b/tests/Zend/Form/Element/HashTest.php index 3410f416a3..cf1a4b7f14 100644 --- a/tests/Zend/Form/Element/HashTest.php +++ b/tests/Zend/Form/Element/HashTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -71,7 +71,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (isset($this->hash)) { unset($this->hash); @@ -91,7 +91,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -281,6 +281,6 @@ public function __call($method, $args) } // Call Zend_Form_Element_HashTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_HashTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_HashTest::main") { Zend_Form_Element_HashTest::main(); } diff --git a/tests/Zend/Form/Element/HiddenTest.php b/tests/Zend/Form/Element/HiddenTest.php index 61877666c5..b99fd0b7b5 100644 --- a/tests/Zend/Form/Element/HiddenTest.php +++ b/tests/Zend/Form/Element/HiddenTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -66,7 +66,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Hidden('foo'); } @@ -77,7 +77,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -117,6 +117,6 @@ protected function _checkZf2794() } // Call Zend_Form_Element_HiddenTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_HiddenTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_HiddenTest::main") { Zend_Form_Element_HiddenTest::main(); } diff --git a/tests/Zend/Form/Element/ImageTest.php b/tests/Zend/Form/Element/ImageTest.php index 6dc4616435..64cfaf5b17 100644 --- a/tests/Zend/Form/Element/ImageTest.php +++ b/tests/Zend/Form/Element/ImageTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Image('foo'); } @@ -79,7 +79,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -227,6 +227,6 @@ public function testFluentInterfaceOnLoadDefaultDecorators() } // Call Zend_Form_Element_ImageTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_ImageTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_ImageTest::main") { Zend_Form_Element_ImageTest::main(); } diff --git a/tests/Zend/Form/Element/MultiCheckboxTest.php b/tests/Zend/Form/Element/MultiCheckboxTest.php index 1f24b292e1..7326bf5055 100644 --- a/tests/Zend/Form/Element/MultiCheckboxTest.php +++ b/tests/Zend/Form/Element/MultiCheckboxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -66,7 +66,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_MultiCheckbox('foo'); } @@ -77,7 +77,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -358,6 +358,6 @@ public function testDisabledForAttributeWithoutLabelDecorator() } // Call Zend_Form_Element_MultiCheckboxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_MultiCheckboxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_MultiCheckboxTest::main") { Zend_Form_Element_MultiCheckboxTest::main(); } diff --git a/tests/Zend/Form/Element/MultiselectTest.php b/tests/Zend/Form/Element/MultiselectTest.php index 9aacdfa3f9..ac522393cf 100644 --- a/tests/Zend/Form/Element/MultiselectTest.php +++ b/tests/Zend/Form/Element/MultiselectTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Multiselect('foo'); } @@ -79,7 +79,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -383,6 +383,6 @@ public function testSimilarErrorMessagesForMultiElementAreNotDuplicated() } // Call Zend_Form_Element_MultiselectTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_MultiselectTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_MultiselectTest::main") { Zend_Form_Element_MultiselectTest::main(); } diff --git a/tests/Zend/Form/Element/NoteTest.php b/tests/Zend/Form/Element/NoteTest.php index 392e7856b8..afeecf3abd 100644 --- a/tests/Zend/Form/Element/NoteTest.php +++ b/tests/Zend/Form/Element/NoteTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Note('foo'); } @@ -79,7 +79,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -242,6 +242,6 @@ protected function _checkZf2794() } // Call Zend_Form_Element_NoteTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_NoteTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_NoteTest::main") { Zend_Form_Element_NoteTest::main(); } diff --git a/tests/Zend/Form/Element/PasswordTest.php b/tests/Zend/Form/Element/PasswordTest.php index e7839e5894..63aa880a60 100644 --- a/tests/Zend/Form/Element/PasswordTest.php +++ b/tests/Zend/Form/Element/PasswordTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -72,7 +72,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->errors = []; $this->element = new Zend_Form_Element_Password('foo'); @@ -84,7 +84,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -190,6 +190,6 @@ public function testShouldPassRenderPasswordAttributeToViewHelper() } // Call Zend_Form_Element_PasswordTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_PasswordTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_PasswordTest::main") { Zend_Form_Element_PasswordTest::main(); } diff --git a/tests/Zend/Form/Element/RadioTest.php b/tests/Zend/Form/Element/RadioTest.php index 2c76a7b233..afa5134216 100644 --- a/tests/Zend/Form/Element/RadioTest.php +++ b/tests/Zend/Form/Element/RadioTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -66,7 +66,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Radio('foo'); } @@ -77,7 +77,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -275,6 +275,6 @@ public function testFluentInterfaceOnLoadDefaultDecorators() } // Call Zend_Form_Element_RadioTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_RadioTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_RadioTest::main") { Zend_Form_Element_RadioTest::main(); } diff --git a/tests/Zend/Form/Element/ResetTest.php b/tests/Zend/Form/Element/ResetTest.php index 675a12683e..370920930f 100644 --- a/tests/Zend/Form/Element/ResetTest.php +++ b/tests/Zend/Form/Element/ResetTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -66,7 +66,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Reset('foo'); } @@ -77,7 +77,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -122,6 +122,6 @@ protected function _checkZf2794() } // Call Zend_Form_Element_ResetTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_ResetTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_ResetTest::main") { Zend_Form_Element_ResetTest::main(); } diff --git a/tests/Zend/Form/Element/SelectTest.php b/tests/Zend/Form/Element/SelectTest.php index 17f0550812..aac62a31f5 100644 --- a/tests/Zend/Form/Element/SelectTest.php +++ b/tests/Zend/Form/Element/SelectTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -66,7 +66,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Select('foo'); } @@ -77,7 +77,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -296,6 +296,6 @@ protected function _checkZf2794() } // Call Zend_Form_Element_SelectTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_SelectTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_SelectTest::main") { Zend_Form_Element_SelectTest::main(); } diff --git a/tests/Zend/Form/Element/SubmitTest.php b/tests/Zend/Form/Element/SubmitTest.php index 00f195870d..82a30bd7d8 100644 --- a/tests/Zend/Form/Element/SubmitTest.php +++ b/tests/Zend/Form/Element/SubmitTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -70,7 +70,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Form::setDefaultTranslator(null); @@ -83,7 +83,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -290,6 +290,6 @@ public function testFluentInterfaceOnLoadDefaultDecorators() } // Call Zend_Form_Element_SubmitTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_SubmitTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_SubmitTest::main") { Zend_Form_Element_SubmitTest::main(); } diff --git a/tests/Zend/Form/Element/TextTest.php b/tests/Zend/Form/Element/TextTest.php index 17d209d816..54c0a8b11f 100644 --- a/tests/Zend/Form/Element/TextTest.php +++ b/tests/Zend/Form/Element/TextTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -66,7 +66,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Text('foo'); } @@ -77,7 +77,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -117,6 +117,6 @@ protected function _checkZf2794() } // Call Zend_Form_Element_TextTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_TextTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_TextTest::main") { Zend_Form_Element_TextTest::main(); } diff --git a/tests/Zend/Form/Element/TextareaTest.php b/tests/Zend/Form/Element/TextareaTest.php index 17c149b2aa..a779a6d5f0 100644 --- a/tests/Zend/Form/Element/TextareaTest.php +++ b/tests/Zend/Form/Element/TextareaTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -66,7 +66,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->element = new Zend_Form_Element_Textarea('foo'); } @@ -77,7 +77,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -117,6 +117,6 @@ protected function _checkZf2794() } // Call Zend_Form_Element_TextareaTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_TextareaTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Form_Element_TextareaTest::main") { Zend_Form_Element_TextareaTest::main(); } diff --git a/tests/Zend/Form/ElementTest.php b/tests/Zend/Form/ElementTest.php index 0b366ae404..430cbf1085 100644 --- a/tests/Zend/Form/ElementTest.php +++ b/tests/Zend/Form/ElementTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { Zend_Registry::_unsetInstance(); Zend_Form::setDefaultTranslator(null); @@ -82,7 +82,7 @@ protected function setUp(): void Zend_Controller_Action_HelperBroker::resetHelpers(); } - protected function tearDown(): void + protected function tear_down() { } @@ -2302,6 +2302,6 @@ protected function _filter($value) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Form_ElementTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Form_ElementTest::main') { Zend_Form_ElementTest::main(); } diff --git a/tests/Zend/Form/FormTest.php b/tests/Zend/Form/FormTest.php index 686eb797ff..9449e101ae 100644 --- a/tests/Zend/Form/FormTest.php +++ b/tests/Zend/Form/FormTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function clearRegistry() @@ -88,7 +88,7 @@ public function clearRegistry() } } - protected function setUp(): void + protected function set_up() { $this->clearRegistry(); Zend_Form::setDefaultTranslator(null); @@ -101,7 +101,7 @@ protected function setUp(): void $this->form = new Zend_Form(); } - protected function tearDown(): void + protected function tear_down() { $this->clearRegistry(); } @@ -4960,6 +4960,6 @@ class MyTestView extends Zend_View { } -if (PHPUnit_MAIN_METHOD == 'Zend_Form_FormTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Form_FormTest::main') { Zend_Form_FormTest::main(); } diff --git a/tests/Zend/Form/SubFormTest.php b/tests/Zend/Form/SubFormTest.php index 852c200796..d9a58784a7 100644 --- a/tests/Zend/Form/SubFormTest.php +++ b/tests/Zend/Form/SubFormTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { Zend_Form::setDefaultTranslator(null); $this->form = new Zend_Form_SubForm(); } - protected function tearDown(): void + protected function tear_down() { } @@ -177,6 +177,6 @@ public function init() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Form_SubFormTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Form_SubFormTest::main') { Zend_Form_SubFormTest::main(); } diff --git a/tests/Zend/Gdata/AllTests.php b/tests/Zend/Gdata/AllTests.php index ff22d2df86..8734694117 100644 --- a/tests/Zend/Gdata/AllTests.php +++ b/tests/Zend/Gdata/AllTests.php @@ -189,7 +189,7 @@ class Zend_Gdata_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -383,6 +383,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Gdata_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Gdata_AllTests::main') { Zend_Gdata_AllTests::main(); } diff --git a/tests/Zend/Gdata/Analytics/AccountFeedTest.php b/tests/Zend/Gdata/Analytics/AccountFeedTest.php index 5a50f619b9..15ce8d61c1 100755 --- a/tests/Zend/Gdata/Analytics/AccountFeedTest.php +++ b/tests/Zend/Gdata/Analytics/AccountFeedTest.php @@ -1,6 +1,6 @@ accountFeed = new Zend_Gdata_Analytics_AccountFeed( file_get_contents(dirname(__FILE__) . '/_files/TestAccountFeed.xml') diff --git a/tests/Zend/Gdata/Analytics/AccountQueryTest.php b/tests/Zend/Gdata/Analytics/AccountQueryTest.php index f49671823b..46ddc6b22b 100644 --- a/tests/Zend/Gdata/Analytics/AccountQueryTest.php +++ b/tests/Zend/Gdata/Analytics/AccountQueryTest.php @@ -1,6 +1,6 @@ accountQuery = new Zend_GData_Analytics_AccountQuery(); $this->queryBase = Zend_GData_Analytics_AccountQuery::ANALYTICS_FEED_URI; diff --git a/tests/Zend/Gdata/Analytics/DataFeedTest.php b/tests/Zend/Gdata/Analytics/DataFeedTest.php index d9baebe6cd..be34081693 100644 --- a/tests/Zend/Gdata/Analytics/DataFeedTest.php +++ b/tests/Zend/Gdata/Analytics/DataFeedTest.php @@ -1,6 +1,6 @@ dataFeed = new Zend_Gdata_Analytics_DataFeed( file_get_contents(dirname(__FILE__) . '/_files/TestDataFeed.xml') diff --git a/tests/Zend/Gdata/Analytics/DataQueryTest.php b/tests/Zend/Gdata/Analytics/DataQueryTest.php index 58dbf71344..6eb873d71f 100644 --- a/tests/Zend/Gdata/Analytics/DataQueryTest.php +++ b/tests/Zend/Gdata/Analytics/DataQueryTest.php @@ -1,6 +1,6 @@ dataQuery = new Zend_GData_Analytics_DataQuery(); } diff --git a/tests/Zend/Gdata/App/AuthorTest.php b/tests/Zend/Gdata/App/AuthorTest.php index 01d6f91f1e..13411e2951 100644 --- a/tests/Zend/Gdata/App/AuthorTest.php +++ b/tests/Zend/Gdata/App/AuthorTest.php @@ -1,6 +1,6 @@ authorText = file_get_contents( 'Zend/Gdata/App/_files/AuthorElementSample1.xml', diff --git a/tests/Zend/Gdata/App/BaseTest.php b/tests/Zend/Gdata/App/BaseTest.php index 1d2e28f5a9..88cb952626 100644 --- a/tests/Zend/Gdata/App/BaseTest.php +++ b/tests/Zend/Gdata/App/BaseTest.php @@ -1,6 +1,6 @@ fileName = 'Zend/Gdata/App/_files/FeedSample1.xml'; $this->base = new Zend_Gdata_App_MockBase(); diff --git a/tests/Zend/Gdata/App/CaptchaRequiredExceptionTest.php b/tests/Zend/Gdata/App/CaptchaRequiredExceptionTest.php index ac7727e43d..84e7b99ddb 100644 --- a/tests/Zend/Gdata/App/CaptchaRequiredExceptionTest.php +++ b/tests/Zend/Gdata/App/CaptchaRequiredExceptionTest.php @@ -1,6 +1,6 @@ exampleException = new Zend_Gdata_App_CaptchaRequiredException('testtoken', 'Captcha?ctoken=testtoken'); } diff --git a/tests/Zend/Gdata/App/CategoryTest.php b/tests/Zend/Gdata/App/CategoryTest.php index 98fd1bcef5..03112d1bb8 100644 --- a/tests/Zend/Gdata/App/CategoryTest.php +++ b/tests/Zend/Gdata/App/CategoryTest.php @@ -1,6 +1,6 @@ categoryText = file_get_contents( 'Zend/Gdata/App/_files/CategoryElementSample1.xml', diff --git a/tests/Zend/Gdata/App/ContentTest.php b/tests/Zend/Gdata/App/ContentTest.php index aee8179162..ef2e0ced26 100644 --- a/tests/Zend/Gdata/App/ContentTest.php +++ b/tests/Zend/Gdata/App/ContentTest.php @@ -1,6 +1,6 @@ contentText = file_get_contents( 'Zend/Gdata/App/_files/ContentElementSample1.xml', diff --git a/tests/Zend/Gdata/App/ControlTest.php b/tests/Zend/Gdata/App/ControlTest.php index 79925380b1..d77e30a2f5 100644 --- a/tests/Zend/Gdata/App/ControlTest.php +++ b/tests/Zend/Gdata/App/ControlTest.php @@ -1,6 +1,6 @@ controlText = file_get_contents( 'Zend/Gdata/App/_files/ControlElementSample1.xml', diff --git a/tests/Zend/Gdata/App/EntryTest.php b/tests/Zend/Gdata/App/EntryTest.php index 2aa5e4ed45..cb1e3464b3 100644 --- a/tests/Zend/Gdata/App/EntryTest.php +++ b/tests/Zend/Gdata/App/EntryTest.php @@ -1,6 +1,6 @@ enryText = $this->loadResponse( dirname(__FILE__) . '/../App/_files/EntrySample1.xml' diff --git a/tests/Zend/Gdata/App/FeedTest.php b/tests/Zend/Gdata/App/FeedTest.php index 0342fe8eef..c1a82e7df9 100644 --- a/tests/Zend/Gdata/App/FeedTest.php +++ b/tests/Zend/Gdata/App/FeedTest.php @@ -1,6 +1,6 @@ feedText = file_get_contents( 'Zend/Gdata/App/_files/FeedSample1.xml', diff --git a/tests/Zend/Gdata/App/GeneratorTest.php b/tests/Zend/Gdata/App/GeneratorTest.php index 08cdceaf2c..48c275007e 100644 --- a/tests/Zend/Gdata/App/GeneratorTest.php +++ b/tests/Zend/Gdata/App/GeneratorTest.php @@ -1,6 +1,6 @@ generatorText = file_get_contents( 'Zend/Gdata/App/_files/GeneratorElementSample1.xml', diff --git a/tests/Zend/Gdata/App/HttpExceptionTest.php b/tests/Zend/Gdata/App/HttpExceptionTest.php index 0a33a07654..3548191b9f 100755 --- a/tests/Zend/Gdata/App/HttpExceptionTest.php +++ b/tests/Zend/Gdata/App/HttpExceptionTest.php @@ -1,6 +1,6 @@ fileName = 'Zend/Gdata/App/_files/FeedSample1.xml'; $this->expectedEtag = 'W/"CkcHQH8_fCp7ImA9WxRTGEw."'; diff --git a/tests/Zend/Gdata/AttendeeStatusTest.php b/tests/Zend/Gdata/AttendeeStatusTest.php index ead2758450..b15cbdc476 100644 --- a/tests/Zend/Gdata/AttendeeStatusTest.php +++ b/tests/Zend/Gdata/AttendeeStatusTest.php @@ -1,6 +1,6 @@ attendeeStatusText = file_get_contents( 'Zend/Gdata/_files/AttendeeStatusElementSample1.xml', diff --git a/tests/Zend/Gdata/AttendeeTypeTest.php b/tests/Zend/Gdata/AttendeeTypeTest.php index d22cc93734..6d02e97c21 100644 --- a/tests/Zend/Gdata/AttendeeTypeTest.php +++ b/tests/Zend/Gdata/AttendeeTypeTest.php @@ -1,6 +1,6 @@ attendeeTypeText = file_get_contents( 'Zend/Gdata/_files/AttendeeTypeElementSample1.xml', diff --git a/tests/Zend/Gdata/AuthSubTest.php b/tests/Zend/Gdata/AuthSubTest.php index 87c3c21f20..9c789daefd 100755 --- a/tests/Zend/Gdata/AuthSubTest.php +++ b/tests/Zend/Gdata/AuthSubTest.php @@ -1,6 +1,6 @@ gdata = new Zend_Gdata_Books_CollectionEntry(); } diff --git a/tests/Zend/Gdata/Books/CollectionFeedTest.php b/tests/Zend/Gdata/Books/CollectionFeedTest.php index 76ba72498f..a2117fb208 100644 --- a/tests/Zend/Gdata/Books/CollectionFeedTest.php +++ b/tests/Zend/Gdata/Books/CollectionFeedTest.php @@ -1,6 +1,6 @@ gdata = new Zend_Gdata_Books_CollectionFeed(); } diff --git a/tests/Zend/Gdata/Books/VolumeEntryTest.php b/tests/Zend/Gdata/Books/VolumeEntryTest.php index 51e846b938..472c9129aa 100644 --- a/tests/Zend/Gdata/Books/VolumeEntryTest.php +++ b/tests/Zend/Gdata/Books/VolumeEntryTest.php @@ -1,6 +1,6 @@ entryText = file_get_contents( 'Zend/Gdata/Books/_files/VolumeEntryDataSample1.xml', diff --git a/tests/Zend/Gdata/Books/VolumeFeedTest.php b/tests/Zend/Gdata/Books/VolumeFeedTest.php index fc5be6a771..30710215fe 100644 --- a/tests/Zend/Gdata/Books/VolumeFeedTest.php +++ b/tests/Zend/Gdata/Books/VolumeFeedTest.php @@ -1,6 +1,6 @@ feedText = file_get_contents( 'Zend/Gdata/Books/_files/VolumeFeedDataSample1.xml', diff --git a/tests/Zend/Gdata/BooksOnlineTest.php b/tests/Zend/Gdata/BooksOnlineTest.php index 4786391839..b2e8f2f989 100644 --- a/tests/Zend/Gdata/BooksOnlineTest.php +++ b/tests/Zend/Gdata/BooksOnlineTest.php @@ -1,6 +1,6 @@ gdata = new Zend_Gdata_Books(new Zend_Http_Client()); } diff --git a/tests/Zend/Gdata/Calendar/AccessLevelTest.php b/tests/Zend/Gdata/Calendar/AccessLevelTest.php index 2dc32daee0..d697a19a72 100644 --- a/tests/Zend/Gdata/Calendar/AccessLevelTest.php +++ b/tests/Zend/Gdata/Calendar/AccessLevelTest.php @@ -1,6 +1,6 @@ accessLevelText = file_get_contents( 'Zend/Gdata/Calendar/_files/AccessLevelElementSample1.xml', diff --git a/tests/Zend/Gdata/Calendar/ColorTest.php b/tests/Zend/Gdata/Calendar/ColorTest.php index 6842000b25..2b0d020ad1 100644 --- a/tests/Zend/Gdata/Calendar/ColorTest.php +++ b/tests/Zend/Gdata/Calendar/ColorTest.php @@ -1,6 +1,6 @@ colorText = file_get_contents( 'Zend/Gdata/Calendar/_files/ColorElementSample1.xml', diff --git a/tests/Zend/Gdata/Calendar/EventEntryTest.php b/tests/Zend/Gdata/Calendar/EventEntryTest.php index 56330151dd..dffebbcc83 100644 --- a/tests/Zend/Gdata/Calendar/EventEntryTest.php +++ b/tests/Zend/Gdata/Calendar/EventEntryTest.php @@ -1,6 +1,6 @@ entryText = file_get_contents( 'Zend/Gdata/Calendar/_files/EventEntrySample1.xml', diff --git a/tests/Zend/Gdata/Calendar/EventQueryExceptionTest.php b/tests/Zend/Gdata/Calendar/EventQueryExceptionTest.php index ab1a6ecdab..1fd305e1e9 100644 --- a/tests/Zend/Gdata/Calendar/EventQueryExceptionTest.php +++ b/tests/Zend/Gdata/Calendar/EventQueryExceptionTest.php @@ -1,6 +1,6 @@ query = new Zend_Gdata_Calendar_EventQuery(); } diff --git a/tests/Zend/Gdata/Calendar/EventQueryTest.php b/tests/Zend/Gdata/Calendar/EventQueryTest.php index 28677996a5..4f1ac8ae44 100644 --- a/tests/Zend/Gdata/Calendar/EventQueryTest.php +++ b/tests/Zend/Gdata/Calendar/EventQueryTest.php @@ -1,6 +1,6 @@ query = new Zend_Gdata_Calendar_EventQuery(); } diff --git a/tests/Zend/Gdata/Calendar/HiddenTest.php b/tests/Zend/Gdata/Calendar/HiddenTest.php index 5d2adc6d83..c58a2dd183 100644 --- a/tests/Zend/Gdata/Calendar/HiddenTest.php +++ b/tests/Zend/Gdata/Calendar/HiddenTest.php @@ -1,6 +1,6 @@ hiddenText = file_get_contents( 'Zend/Gdata/Calendar/_files/HiddenElementSample1.xml', diff --git a/tests/Zend/Gdata/Calendar/LinkTest.php b/tests/Zend/Gdata/Calendar/LinkTest.php index 660682d054..11a145b871 100644 --- a/tests/Zend/Gdata/Calendar/LinkTest.php +++ b/tests/Zend/Gdata/Calendar/LinkTest.php @@ -1,6 +1,6 @@ linkText = file_get_contents( 'Zend/Gdata/Calendar/_files/LinkElementSample1.xml', diff --git a/tests/Zend/Gdata/Calendar/QuickAddTest.php b/tests/Zend/Gdata/Calendar/QuickAddTest.php index 251bb714fd..1acc3558dc 100644 --- a/tests/Zend/Gdata/Calendar/QuickAddTest.php +++ b/tests/Zend/Gdata/Calendar/QuickAddTest.php @@ -1,6 +1,6 @@ quickAddText = file_get_contents( 'Zend/Gdata/Calendar/_files/QuickAddElementSample1.xml', diff --git a/tests/Zend/Gdata/Calendar/SelectedTest.php b/tests/Zend/Gdata/Calendar/SelectedTest.php index f73f5c5391..934b62e8b8 100644 --- a/tests/Zend/Gdata/Calendar/SelectedTest.php +++ b/tests/Zend/Gdata/Calendar/SelectedTest.php @@ -1,6 +1,6 @@ selectedText = file_get_contents( 'Zend/Gdata/Calendar/_files/SelectedElementSample1.xml', diff --git a/tests/Zend/Gdata/Calendar/SendEventNotificationsTest.php b/tests/Zend/Gdata/Calendar/SendEventNotificationsTest.php index c62e24aa9a..7a56076e6d 100644 --- a/tests/Zend/Gdata/Calendar/SendEventNotificationsTest.php +++ b/tests/Zend/Gdata/Calendar/SendEventNotificationsTest.php @@ -1,6 +1,6 @@ sendEventNotificationsText = file_get_contents( 'Zend/Gdata/Calendar/_files/SendEventNotificationsElementSample1.xml', diff --git a/tests/Zend/Gdata/Calendar/TimezoneTest.php b/tests/Zend/Gdata/Calendar/TimezoneTest.php index 8a91623cc8..9a374d7296 100644 --- a/tests/Zend/Gdata/Calendar/TimezoneTest.php +++ b/tests/Zend/Gdata/Calendar/TimezoneTest.php @@ -1,6 +1,6 @@ timezoneText = file_get_contents( 'Zend/Gdata/Calendar/_files/TimezoneElementSample1.xml', diff --git a/tests/Zend/Gdata/Calendar/WebContentTest.php b/tests/Zend/Gdata/Calendar/WebContentTest.php index 403d7397bd..338a214f73 100644 --- a/tests/Zend/Gdata/Calendar/WebContentTest.php +++ b/tests/Zend/Gdata/Calendar/WebContentTest.php @@ -1,6 +1,6 @@ webContentText = file_get_contents( 'Zend/Gdata/Calendar/_files/WebContentElementSample1.xml', diff --git a/tests/Zend/Gdata/CalendarEventTest.php b/tests/Zend/Gdata/CalendarEventTest.php index 039708c47d..dad0e33f56 100644 --- a/tests/Zend/Gdata/CalendarEventTest.php +++ b/tests/Zend/Gdata/CalendarEventTest.php @@ -1,6 +1,6 @@ eventFeedText = file_get_contents( 'Zend/Gdata/Calendar/_files/TestDataEventFeedSample1.xml', diff --git a/tests/Zend/Gdata/CommentsTest.php b/tests/Zend/Gdata/CommentsTest.php index 590c7d26ba..018d02c41e 100644 --- a/tests/Zend/Gdata/CommentsTest.php +++ b/tests/Zend/Gdata/CommentsTest.php @@ -1,6 +1,6 @@ commentsText = file_get_contents( 'Zend/Gdata/_files/CommentsElementSample1.xml', diff --git a/tests/Zend/Gdata/Docs/DocumentListEntryTest.php b/tests/Zend/Gdata/Docs/DocumentListEntryTest.php index 68b1912f30..93bd304546 100755 --- a/tests/Zend/Gdata/Docs/DocumentListEntryTest.php +++ b/tests/Zend/Gdata/Docs/DocumentListEntryTest.php @@ -1,6 +1,6 @@ doc = new Zend_Gdata_Docs_DocumentListEntry( file_get_contents('Zend/Gdata/Docs/_files/TestDataDocumentListEntrySample.xml', true) diff --git a/tests/Zend/Gdata/Docs/DocumentListFeedTest.php b/tests/Zend/Gdata/Docs/DocumentListFeedTest.php index a7615a2b0d..59a77da0bd 100755 --- a/tests/Zend/Gdata/Docs/DocumentListFeedTest.php +++ b/tests/Zend/Gdata/Docs/DocumentListFeedTest.php @@ -1,6 +1,6 @@ docFeed = new Zend_Gdata_Docs_DocumentListFeed( file_get_contents(dirname(__FILE__) . '/_files/TestDataDocumentListFeedSample.xml'), diff --git a/tests/Zend/Gdata/Docs/QueryTest.php b/tests/Zend/Gdata/Docs/QueryTest.php index e40e25977d..b78a483deb 100755 --- a/tests/Zend/Gdata/Docs/QueryTest.php +++ b/tests/Zend/Gdata/Docs/QueryTest.php @@ -1,6 +1,6 @@ docQuery = new Zend_Gdata_Docs_Query(); } diff --git a/tests/Zend/Gdata/DocsOnlineTest.php b/tests/Zend/Gdata/DocsOnlineTest.php index 2247547313..6f30f19b99 100755 --- a/tests/Zend/Gdata/DocsOnlineTest.php +++ b/tests/Zend/Gdata/DocsOnlineTest.php @@ -1,6 +1,6 @@ adapter = new Test_Zend_Gdata_MockHttpClient(); $this->client = new Zend_Gdata_HttpClient(); diff --git a/tests/Zend/Gdata/EntryLinkTest.php b/tests/Zend/Gdata/EntryLinkTest.php index 52f7925bb3..0c51e0577e 100644 --- a/tests/Zend/Gdata/EntryLinkTest.php +++ b/tests/Zend/Gdata/EntryLinkTest.php @@ -1,6 +1,6 @@ entryLinkText = file_get_contents( 'Zend/Gdata/_files/EntryLinkElementSample1.xml', diff --git a/tests/Zend/Gdata/EntryTest.php b/tests/Zend/Gdata/EntryTest.php index d51a5d952e..a59a1d8ad3 100644 --- a/tests/Zend/Gdata/EntryTest.php +++ b/tests/Zend/Gdata/EntryTest.php @@ -1,6 +1,6 @@ entry = new Zend_Gdata_Entry(); $this->entryText = file_get_contents( diff --git a/tests/Zend/Gdata/EventStatusTest.php b/tests/Zend/Gdata/EventStatusTest.php index c3e9e51feb..35dbda87ca 100644 --- a/tests/Zend/Gdata/EventStatusTest.php +++ b/tests/Zend/Gdata/EventStatusTest.php @@ -1,6 +1,6 @@ eventStatusText = file_get_contents( 'Zend/Gdata/_files/EventStatusElementSample1.xml', diff --git a/tests/Zend/Gdata/ExtendedPropertyTest.php b/tests/Zend/Gdata/ExtendedPropertyTest.php index 56806a9ada..3def9d392f 100644 --- a/tests/Zend/Gdata/ExtendedPropertyTest.php +++ b/tests/Zend/Gdata/ExtendedPropertyTest.php @@ -1,6 +1,6 @@ extendedPropertyText = file_get_contents( 'Zend/Gdata/_files/ExtendedPropertyElementSample1.xml', diff --git a/tests/Zend/Gdata/FeedLinkTest.php b/tests/Zend/Gdata/FeedLinkTest.php index 4a85444bd7..2995f55a4f 100644 --- a/tests/Zend/Gdata/FeedLinkTest.php +++ b/tests/Zend/Gdata/FeedLinkTest.php @@ -1,6 +1,6 @@ feedLinkText = file_get_contents( 'Zend/Gdata/_files/FeedLinkElementSample1.xml', diff --git a/tests/Zend/Gdata/FeedTest.php b/tests/Zend/Gdata/FeedTest.php index 497cce8522..bfdbb9fb80 100644 --- a/tests/Zend/Gdata/FeedTest.php +++ b/tests/Zend/Gdata/FeedTest.php @@ -1,6 +1,6 @@ etagLocalName = 'etag'; $this->expectedEtag = 'W/"CE4BRXw4cCp7ImA9WxRVFEs."'; diff --git a/tests/Zend/Gdata/Gapps/EmailListEntryTest.php b/tests/Zend/Gdata/Gapps/EmailListEntryTest.php index a4afd590f6..95779f0db3 100644 --- a/tests/Zend/Gdata/Gapps/EmailListEntryTest.php +++ b/tests/Zend/Gdata/Gapps/EmailListEntryTest.php @@ -1,6 +1,6 @@ entryText = file_get_contents( 'Zend/Gdata/Gapps/_files/EmailListEntryDataSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/EmailListFeedTest.php b/tests/Zend/Gdata/Gapps/EmailListFeedTest.php index 7e3c4af973..be4709edf7 100644 --- a/tests/Zend/Gdata/Gapps/EmailListFeedTest.php +++ b/tests/Zend/Gdata/Gapps/EmailListFeedTest.php @@ -1,6 +1,6 @@ query = new Zend_Gdata_Gapps_EmailListQuery(); } diff --git a/tests/Zend/Gdata/Gapps/EmailListRecipientEntryTest.php b/tests/Zend/Gdata/Gapps/EmailListRecipientEntryTest.php index f48ae2503c..e44dbf6cf2 100644 --- a/tests/Zend/Gdata/Gapps/EmailListRecipientEntryTest.php +++ b/tests/Zend/Gdata/Gapps/EmailListRecipientEntryTest.php @@ -1,6 +1,6 @@ entryText = file_get_contents( 'Zend/Gdata/Gapps/_files/EmailListRecipientEntryDataSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/EmailListRecipientFeedTest.php b/tests/Zend/Gdata/Gapps/EmailListRecipientFeedTest.php index 8957db95b1..410b7dea28 100644 --- a/tests/Zend/Gdata/Gapps/EmailListRecipientFeedTest.php +++ b/tests/Zend/Gdata/Gapps/EmailListRecipientFeedTest.php @@ -1,6 +1,6 @@ query = new Zend_Gdata_Gapps_EmailListRecipientQuery(); } diff --git a/tests/Zend/Gdata/Gapps/EmailListTest.php b/tests/Zend/Gdata/Gapps/EmailListTest.php index 2581dea368..c586d7ac6b 100644 --- a/tests/Zend/Gdata/Gapps/EmailListTest.php +++ b/tests/Zend/Gdata/Gapps/EmailListTest.php @@ -1,6 +1,6 @@ emailListText = file_get_contents( 'Zend/Gdata/Gapps/_files/EmailListElementSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/ErrorTest.php b/tests/Zend/Gdata/Gapps/ErrorTest.php index 0022d2d1ba..64212c1f12 100644 --- a/tests/Zend/Gdata/Gapps/ErrorTest.php +++ b/tests/Zend/Gdata/Gapps/ErrorTest.php @@ -1,6 +1,6 @@ error = new Zend_Gdata_Gapps_Error(); } diff --git a/tests/Zend/Gdata/Gapps/GroupEntryTest.php b/tests/Zend/Gdata/Gapps/GroupEntryTest.php index ed3364376c..84892e9398 100644 --- a/tests/Zend/Gdata/Gapps/GroupEntryTest.php +++ b/tests/Zend/Gdata/Gapps/GroupEntryTest.php @@ -1,6 +1,6 @@ entryText = file_get_contents( 'Zend/Gdata/Gapps/_files/GroupEntryDataSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/GroupFeedTest.php b/tests/Zend/Gdata/Gapps/GroupFeedTest.php index 7f17444399..cfb1b2a035 100644 --- a/tests/Zend/Gdata/Gapps/GroupFeedTest.php +++ b/tests/Zend/Gdata/Gapps/GroupFeedTest.php @@ -1,6 +1,6 @@ query = new Zend_Gdata_Gapps_GroupQuery(); } diff --git a/tests/Zend/Gdata/Gapps/LoginTest.php b/tests/Zend/Gdata/Gapps/LoginTest.php index f3146e8f69..f911ab0367 100644 --- a/tests/Zend/Gdata/Gapps/LoginTest.php +++ b/tests/Zend/Gdata/Gapps/LoginTest.php @@ -1,6 +1,6 @@ loginText = file_get_contents( 'Zend/Gdata/Gapps/_files/LoginElementSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/MemberEntryTest.php b/tests/Zend/Gdata/Gapps/MemberEntryTest.php index caccba5184..b43b658a65 100644 --- a/tests/Zend/Gdata/Gapps/MemberEntryTest.php +++ b/tests/Zend/Gdata/Gapps/MemberEntryTest.php @@ -1,6 +1,6 @@ entryText = file_get_contents( 'Zend/Gdata/Gapps/_files/MemberEntryDataSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/MemberFeedTest.php b/tests/Zend/Gdata/Gapps/MemberFeedTest.php index 15cfafe154..05c1b2168b 100644 --- a/tests/Zend/Gdata/Gapps/MemberFeedTest.php +++ b/tests/Zend/Gdata/Gapps/MemberFeedTest.php @@ -1,6 +1,6 @@ query = new Zend_Gdata_Gapps_MemberQuery(); } diff --git a/tests/Zend/Gdata/Gapps/NameTest.php b/tests/Zend/Gdata/Gapps/NameTest.php index fa562fe918..7f80284eff 100644 --- a/tests/Zend/Gdata/Gapps/NameTest.php +++ b/tests/Zend/Gdata/Gapps/NameTest.php @@ -1,6 +1,6 @@ theNameText = file_get_contents( 'Zend/Gdata/Gapps/_files/NameElementSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/NicknameEntryTest.php b/tests/Zend/Gdata/Gapps/NicknameEntryTest.php index 35c4a063fb..a5b066178e 100644 --- a/tests/Zend/Gdata/Gapps/NicknameEntryTest.php +++ b/tests/Zend/Gdata/Gapps/NicknameEntryTest.php @@ -1,6 +1,6 @@ entryText = file_get_contents( 'Zend/Gdata/Gapps/_files/NicknameEntryDataSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/NicknameFeedTest.php b/tests/Zend/Gdata/Gapps/NicknameFeedTest.php index 6127f3f23c..f5b7d34204 100644 --- a/tests/Zend/Gdata/Gapps/NicknameFeedTest.php +++ b/tests/Zend/Gdata/Gapps/NicknameFeedTest.php @@ -1,6 +1,6 @@ query = new Zend_Gdata_Gapps_NicknameQuery(); } diff --git a/tests/Zend/Gdata/Gapps/NicknameTest.php b/tests/Zend/Gdata/Gapps/NicknameTest.php index 06e7c3a879..2a2749c667 100644 --- a/tests/Zend/Gdata/Gapps/NicknameTest.php +++ b/tests/Zend/Gdata/Gapps/NicknameTest.php @@ -1,6 +1,6 @@ nicknameText = file_get_contents( 'Zend/Gdata/Gapps/_files/NicknameElementSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/OwnerEntryTest.php b/tests/Zend/Gdata/Gapps/OwnerEntryTest.php index a6b5fef487..90fd00be5e 100644 --- a/tests/Zend/Gdata/Gapps/OwnerEntryTest.php +++ b/tests/Zend/Gdata/Gapps/OwnerEntryTest.php @@ -1,6 +1,6 @@ entryText = file_get_contents( 'Zend/Gdata/Gapps/_files/OwnerEntryDataSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/OwnerFeedTest.php b/tests/Zend/Gdata/Gapps/OwnerFeedTest.php index 30ecc1d68d..f840352685 100644 --- a/tests/Zend/Gdata/Gapps/OwnerFeedTest.php +++ b/tests/Zend/Gdata/Gapps/OwnerFeedTest.php @@ -1,6 +1,6 @@ query = new Zend_Gdata_Gapps_OwnerQuery(); } diff --git a/tests/Zend/Gdata/Gapps/PropertyTest.php b/tests/Zend/Gdata/Gapps/PropertyTest.php index c87b78174b..2fe2419689 100644 --- a/tests/Zend/Gdata/Gapps/PropertyTest.php +++ b/tests/Zend/Gdata/Gapps/PropertyTest.php @@ -1,6 +1,6 @@ thePropertyText = file_get_contents( 'Zend/Gdata/Gapps/_files/PropertyElementSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/QuotaTest.php b/tests/Zend/Gdata/Gapps/QuotaTest.php index 7ae8cd4c61..e110ca8263 100644 --- a/tests/Zend/Gdata/Gapps/QuotaTest.php +++ b/tests/Zend/Gdata/Gapps/QuotaTest.php @@ -1,6 +1,6 @@ quotaText = file_get_contents( 'Zend/Gdata/Gapps/_files/QuotaElementSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/ServiceExceptionTest.php b/tests/Zend/Gdata/Gapps/ServiceExceptionTest.php index 59d6c8f636..68ced338e7 100644 --- a/tests/Zend/Gdata/Gapps/ServiceExceptionTest.php +++ b/tests/Zend/Gdata/Gapps/ServiceExceptionTest.php @@ -1,6 +1,6 @@ xmlSample = file_get_contents( 'Zend/Gdata/Gapps/_files/AppsForYourDomainElementSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/UserEntryTest.php b/tests/Zend/Gdata/Gapps/UserEntryTest.php index 8506f5c369..0f1f22b546 100644 --- a/tests/Zend/Gdata/Gapps/UserEntryTest.php +++ b/tests/Zend/Gdata/Gapps/UserEntryTest.php @@ -1,6 +1,6 @@ entryText = file_get_contents( 'Zend/Gdata/Gapps/_files/UserEntryDataSample1.xml', diff --git a/tests/Zend/Gdata/Gapps/UserFeedTest.php b/tests/Zend/Gdata/Gapps/UserFeedTest.php index 5536d489b7..bb75caf564 100644 --- a/tests/Zend/Gdata/Gapps/UserFeedTest.php +++ b/tests/Zend/Gdata/Gapps/UserFeedTest.php @@ -1,6 +1,6 @@ query = new Zend_Gdata_Gapps_UserQuery(); } diff --git a/tests/Zend/Gdata/GappsOnlineTest.php b/tests/Zend/Gdata/GappsOnlineTest.php index 6f08fed49d..69365a2a46 100644 --- a/tests/Zend/Gdata/GappsOnlineTest.php +++ b/tests/Zend/Gdata/GappsOnlineTest.php @@ -1,6 +1,6 @@ id = uniqid('ZF-'); $username = constant('TESTS_ZEND_GDATA_GAPPS_EMAIL'); @@ -79,7 +79,7 @@ protected function setUp(): void $this->autoDeletePool = []; } - protected function tearDown(): void + protected function tear_down() { // Delete all entries in $this->autoDeletePool. foreach ($this->autoDeletePool as $x) { diff --git a/tests/Zend/Gdata/GappsTest.php b/tests/Zend/Gdata/GappsTest.php index 61edc7ce3a..bcc14748f9 100644 --- a/tests/Zend/Gdata/GappsTest.php +++ b/tests/Zend/Gdata/GappsTest.php @@ -1,6 +1,6 @@ locationOfFakeBinary = 'Zend/Gdata/_files/MediaMimeStreamSample1.txt'; diff --git a/tests/Zend/Gdata/OpenSearchItemsPerPageTest.php b/tests/Zend/Gdata/OpenSearchItemsPerPageTest.php index ed6a447328..05bd6540d9 100644 --- a/tests/Zend/Gdata/OpenSearchItemsPerPageTest.php +++ b/tests/Zend/Gdata/OpenSearchItemsPerPageTest.php @@ -1,6 +1,6 @@ openSearchItemsPerPageText = file_get_contents( 'Zend/Gdata/_files/OpenSearchItemsPerPageElementSample1.xml', diff --git a/tests/Zend/Gdata/OpenSearchStartIndexTest.php b/tests/Zend/Gdata/OpenSearchStartIndexTest.php index 730d7b01df..27a6be4d57 100644 --- a/tests/Zend/Gdata/OpenSearchStartIndexTest.php +++ b/tests/Zend/Gdata/OpenSearchStartIndexTest.php @@ -1,6 +1,6 @@ openSearchStartIndexText = file_get_contents( 'Zend/Gdata/_files/OpenSearchStartIndexElementSample1.xml', diff --git a/tests/Zend/Gdata/OpenSearchTotalResultsTest.php b/tests/Zend/Gdata/OpenSearchTotalResultsTest.php index f349edc954..b43fd8203a 100644 --- a/tests/Zend/Gdata/OpenSearchTotalResultsTest.php +++ b/tests/Zend/Gdata/OpenSearchTotalResultsTest.php @@ -1,6 +1,6 @@ openSearchTotalResultsText = file_get_contents( 'Zend/Gdata/_files/OpenSearchTotalResultsElementSample1.xml', diff --git a/tests/Zend/Gdata/OriginalEventTest.php b/tests/Zend/Gdata/OriginalEventTest.php index 5a1400a013..7be319abf7 100644 --- a/tests/Zend/Gdata/OriginalEventTest.php +++ b/tests/Zend/Gdata/OriginalEventTest.php @@ -1,6 +1,6 @@ originalEventText = file_get_contents( 'Zend/Gdata/_files/OriginalEventElementSample1.xml', diff --git a/tests/Zend/Gdata/Photos/PhotosAlbumEntryTest.php b/tests/Zend/Gdata/Photos/PhotosAlbumEntryTest.php index 4b4a842e2a..cd0a19f1df 100755 --- a/tests/Zend/Gdata/Photos/PhotosAlbumEntryTest.php +++ b/tests/Zend/Gdata/Photos/PhotosAlbumEntryTest.php @@ -1,6 +1,6 @@ recurrenceExceptionText = file_get_contents( 'Zend/Gdata/_files/RecurrenceExceptionElementSample1.xml', diff --git a/tests/Zend/Gdata/RecurrenceTest.php b/tests/Zend/Gdata/RecurrenceTest.php index d81a5257ef..37de9a8e9f 100644 --- a/tests/Zend/Gdata/RecurrenceTest.php +++ b/tests/Zend/Gdata/RecurrenceTest.php @@ -1,6 +1,6 @@ recurrenceText = file_get_contents( 'Zend/Gdata/_files/RecurrenceElementSample1.xml', diff --git a/tests/Zend/Gdata/ReminderTest.php b/tests/Zend/Gdata/ReminderTest.php index cd3ffb7c8a..0a36baa01d 100644 --- a/tests/Zend/Gdata/ReminderTest.php +++ b/tests/Zend/Gdata/ReminderTest.php @@ -1,6 +1,6 @@ reminderText = file_get_contents( 'Zend/Gdata/_files/ReminderElementSample1.xml', diff --git a/tests/Zend/Gdata/SkipTests.php b/tests/Zend/Gdata/SkipTests.php index 7e97bd97ca..43b35edffb 100644 --- a/tests/Zend/Gdata/SkipTests.php +++ b/tests/Zend/Gdata/SkipTests.php @@ -1,6 +1,6 @@ markTestSkipped("Zend_Gdata online tests are not enabled in TestConfiguration.php"); } @@ -46,7 +46,7 @@ public function testOnline() class Zend_Gdata_SkipClientLoginTest extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped("Zend_Gdata authenticated tests are not enabled in TestConfiguration.php"); } diff --git a/tests/Zend/Gdata/Spreadsheets/CellEntryTest.php b/tests/Zend/Gdata/Spreadsheets/CellEntryTest.php index bcc524e445..e1c7844c6e 100644 --- a/tests/Zend/Gdata/Spreadsheets/CellEntryTest.php +++ b/tests/Zend/Gdata/Spreadsheets/CellEntryTest.php @@ -1,6 +1,6 @@ cellEntry = new Zend_Gdata_Spreadsheets_CellEntry(); } diff --git a/tests/Zend/Gdata/Spreadsheets/CellFeedTest.php b/tests/Zend/Gdata/Spreadsheets/CellFeedTest.php index 250e96dc57..29ec9cdd8a 100644 --- a/tests/Zend/Gdata/Spreadsheets/CellFeedTest.php +++ b/tests/Zend/Gdata/Spreadsheets/CellFeedTest.php @@ -1,6 +1,6 @@ cellFeed = new Zend_Gdata_Spreadsheets_CellFeed( file_get_contents('Zend/Gdata/Spreadsheets/_files/TestDataCellFeedSample1.xml', true), diff --git a/tests/Zend/Gdata/Spreadsheets/CellQueryTest.php b/tests/Zend/Gdata/Spreadsheets/CellQueryTest.php index 0e35eb2b5e..51487874a6 100644 --- a/tests/Zend/Gdata/Spreadsheets/CellQueryTest.php +++ b/tests/Zend/Gdata/Spreadsheets/CellQueryTest.php @@ -1,6 +1,6 @@ docQuery = new Zend_Gdata_Spreadsheets_CellQuery(); } diff --git a/tests/Zend/Gdata/Spreadsheets/CellTest.php b/tests/Zend/Gdata/Spreadsheets/CellTest.php index f8d514d2be..730edb8e00 100644 --- a/tests/Zend/Gdata/Spreadsheets/CellTest.php +++ b/tests/Zend/Gdata/Spreadsheets/CellTest.php @@ -1,6 +1,6 @@ cell = new Zend_Gdata_Spreadsheets_Extension_Cell(); } diff --git a/tests/Zend/Gdata/Spreadsheets/ColCountTest.php b/tests/Zend/Gdata/Spreadsheets/ColCountTest.php index 11ea3222d5..75af8193b3 100644 --- a/tests/Zend/Gdata/Spreadsheets/ColCountTest.php +++ b/tests/Zend/Gdata/Spreadsheets/ColCountTest.php @@ -1,6 +1,6 @@ colCount = new Zend_Gdata_Spreadsheets_Extension_ColCount(); } diff --git a/tests/Zend/Gdata/Spreadsheets/CustomTest.php b/tests/Zend/Gdata/Spreadsheets/CustomTest.php index 9b2a27fc20..f5ed641fec 100644 --- a/tests/Zend/Gdata/Spreadsheets/CustomTest.php +++ b/tests/Zend/Gdata/Spreadsheets/CustomTest.php @@ -1,6 +1,6 @@ custom = new Zend_Gdata_Spreadsheets_Extension_Custom(); } diff --git a/tests/Zend/Gdata/Spreadsheets/DocumentQueryTest.php b/tests/Zend/Gdata/Spreadsheets/DocumentQueryTest.php index c9e6c66887..c8b7da894c 100644 --- a/tests/Zend/Gdata/Spreadsheets/DocumentQueryTest.php +++ b/tests/Zend/Gdata/Spreadsheets/DocumentQueryTest.php @@ -1,6 +1,6 @@ docQuery = new Zend_Gdata_Spreadsheets_DocumentQuery(); } diff --git a/tests/Zend/Gdata/Spreadsheets/ListEntryTest.php b/tests/Zend/Gdata/Spreadsheets/ListEntryTest.php index 6e5a7864af..711d224d7e 100644 --- a/tests/Zend/Gdata/Spreadsheets/ListEntryTest.php +++ b/tests/Zend/Gdata/Spreadsheets/ListEntryTest.php @@ -1,6 +1,6 @@ listEntry = new Zend_Gdata_Spreadsheets_ListEntry(); $this->rowData = []; diff --git a/tests/Zend/Gdata/Spreadsheets/ListFeedTest.php b/tests/Zend/Gdata/Spreadsheets/ListFeedTest.php index 7466a6d801..725ebaddc3 100644 --- a/tests/Zend/Gdata/Spreadsheets/ListFeedTest.php +++ b/tests/Zend/Gdata/Spreadsheets/ListFeedTest.php @@ -1,6 +1,6 @@ listFeed = new Zend_Gdata_Spreadsheets_ListFeed( file_get_contents(dirname(__FILE__) . '/_files/TestDataListFeedSample1.xml'), diff --git a/tests/Zend/Gdata/Spreadsheets/ListQueryTest.php b/tests/Zend/Gdata/Spreadsheets/ListQueryTest.php index ed12e536a6..e88010366f 100644 --- a/tests/Zend/Gdata/Spreadsheets/ListQueryTest.php +++ b/tests/Zend/Gdata/Spreadsheets/ListQueryTest.php @@ -1,6 +1,6 @@ docQuery = new Zend_Gdata_Spreadsheets_ListQuery(); } diff --git a/tests/Zend/Gdata/Spreadsheets/RowCountTest.php b/tests/Zend/Gdata/Spreadsheets/RowCountTest.php index 89ee780b32..7a82eda5f2 100644 --- a/tests/Zend/Gdata/Spreadsheets/RowCountTest.php +++ b/tests/Zend/Gdata/Spreadsheets/RowCountTest.php @@ -1,6 +1,6 @@ rowCount = new Zend_Gdata_Spreadsheets_Extension_RowCount(); } diff --git a/tests/Zend/Gdata/Spreadsheets/SpreadsheetFeedTest.php b/tests/Zend/Gdata/Spreadsheets/SpreadsheetFeedTest.php index 63814185d9..07653c1b7c 100644 --- a/tests/Zend/Gdata/Spreadsheets/SpreadsheetFeedTest.php +++ b/tests/Zend/Gdata/Spreadsheets/SpreadsheetFeedTest.php @@ -1,6 +1,6 @@ sprFeed = new Zend_Gdata_Spreadsheets_SpreadsheetFeed( file_get_contents(dirname(__FILE__) . '/_files/TestDataSpreadsheetFeedSample1.xml'), diff --git a/tests/Zend/Gdata/Spreadsheets/WorksheetEntryTest.php b/tests/Zend/Gdata/Spreadsheets/WorksheetEntryTest.php index 888a0f7c66..c7988725a5 100644 --- a/tests/Zend/Gdata/Spreadsheets/WorksheetEntryTest.php +++ b/tests/Zend/Gdata/Spreadsheets/WorksheetEntryTest.php @@ -1,6 +1,6 @@ wksEntry = new Zend_Gdata_Spreadsheets_WorksheetEntry(); } diff --git a/tests/Zend/Gdata/Spreadsheets/WorksheetFeedTest.php b/tests/Zend/Gdata/Spreadsheets/WorksheetFeedTest.php index 6c32f6e4aa..1398719b8a 100644 --- a/tests/Zend/Gdata/Spreadsheets/WorksheetFeedTest.php +++ b/tests/Zend/Gdata/Spreadsheets/WorksheetFeedTest.php @@ -1,6 +1,6 @@ wksFeed = new Zend_Gdata_Spreadsheets_WorksheetFeed( file_get_contents(dirname(__FILE__) . '/_files/TestDataWorksheetFeedSample1.xml'), diff --git a/tests/Zend/Gdata/SpreadsheetsOnlineTest.php b/tests/Zend/Gdata/SpreadsheetsOnlineTest.php index df7fe085ba..a6e1caccdb 100644 --- a/tests/Zend/Gdata/SpreadsheetsOnlineTest.php +++ b/tests/Zend/Gdata/SpreadsheetsOnlineTest.php @@ -1,6 +1,6 @@ gdata = new Zend_Gdata_Spreadsheets(new Zend_Http_Client()); } diff --git a/tests/Zend/Gdata/TransparencyTest.php b/tests/Zend/Gdata/TransparencyTest.php index 09151b6c76..1dafec1a7e 100644 --- a/tests/Zend/Gdata/TransparencyTest.php +++ b/tests/Zend/Gdata/TransparencyTest.php @@ -1,6 +1,6 @@ transparencyText = file_get_contents( 'Zend/Gdata/_files/TransparencyElementSample1.xml', diff --git a/tests/Zend/Gdata/VisibilityTest.php b/tests/Zend/Gdata/VisibilityTest.php index 4ab6ad14ba..309f164428 100644 --- a/tests/Zend/Gdata/VisibilityTest.php +++ b/tests/Zend/Gdata/VisibilityTest.php @@ -1,6 +1,6 @@ visibilityText = file_get_contents( 'Zend/Gdata/_files/VisibilityElementSample1.xml', diff --git a/tests/Zend/Gdata/WhenTest.php b/tests/Zend/Gdata/WhenTest.php index 48301cfdfc..9b260a7146 100644 --- a/tests/Zend/Gdata/WhenTest.php +++ b/tests/Zend/Gdata/WhenTest.php @@ -1,6 +1,6 @@ whenText = file_get_contents( 'Zend/Gdata/_files/WhenElementSample1.xml', diff --git a/tests/Zend/Gdata/WhereTest.php b/tests/Zend/Gdata/WhereTest.php index 351745c5c4..701aad896c 100644 --- a/tests/Zend/Gdata/WhereTest.php +++ b/tests/Zend/Gdata/WhereTest.php @@ -1,6 +1,6 @@ whereText = file_get_contents( 'Zend/Gdata/_files/WhereElementSample1.xml', diff --git a/tests/Zend/Gdata/WhoTest.php b/tests/Zend/Gdata/WhoTest.php index f92b3b4b88..3e12b5e34b 100644 --- a/tests/Zend/Gdata/WhoTest.php +++ b/tests/Zend/Gdata/WhoTest.php @@ -1,6 +1,6 @@ whoText = file_get_contents( 'Zend/Gdata/_files/WhoElementSample1.xml', diff --git a/tests/Zend/Http/AllTests.php b/tests/Zend/Http/AllTests.php index 270d4f062b..40e004d5f8 100644 --- a/tests/Zend/Http/AllTests.php +++ b/tests/Zend/Http/AllTests.php @@ -47,7 +47,7 @@ class Zend_Http_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -65,6 +65,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Http_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Http_AllTests::main') { Zend_Http_AllTests::main(); } diff --git a/tests/Zend/Http/Client/AllTests.php b/tests/Zend/Http/Client/AllTests.php index 2ff3344f3e..1f22516e93 100644 --- a/tests/Zend/Http/Client/AllTests.php +++ b/tests/Zend/Http/Client/AllTests.php @@ -51,7 +51,7 @@ class Zend_Http_Client_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -79,6 +79,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Http_Client_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Http_Client_AllTests::main') { Zend_Http_Client_AllTests::main(); } diff --git a/tests/Zend/Http/Client/ClientTest.php b/tests/Zend/Http/Client/ClientTest.php index f91e7b59ff..b35338f618 100644 --- a/tests/Zend/Http/Client/ClientTest.php +++ b/tests/Zend/Http/Client/ClientTest.php @@ -1,6 +1,6 @@ client = new Zend_Http_Client(); } diff --git a/tests/Zend/Http/Client/CommonHttpTests.php b/tests/Zend/Http/Client/CommonHttpTests.php index b1b206bd9d..07487b240f 100644 --- a/tests/Zend/Http/Client/CommonHttpTests.php +++ b/tests/Zend/Http/Client/CommonHttpTests.php @@ -1,6 +1,6 @@ client = null; $this->_adapter = null; diff --git a/tests/Zend/Http/Client/CurlTest.php b/tests/Zend/Http/Client/CurlTest.php index c6a3c62739..1b42920c1d 100644 --- a/tests/Zend/Http/Client/CurlTest.php +++ b/tests/Zend/Http/Client/CurlTest.php @@ -67,15 +67,15 @@ class Zend_Http_Client_CurlTest extends Zend_Http_Client_CommonHttpTests public static function main() { $suite = new TestSuite(__CLASS__); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!extension_loaded('curl')) { $this->markTestSkipped('cURL is not installed, marking all Http Client Curl Adapter tests skipped.'); } - parent::setUp(); + parent::set_up(); } /** @@ -320,6 +320,6 @@ public function testHeadRequest() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Http_Client_CurlTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Http_Client_CurlTest::main') { Zend_Http_Client_CurlTest::main(); } diff --git a/tests/Zend/Http/Client/ProxyAdapterTest.php b/tests/Zend/Http/Client/ProxyAdapterTest.php index a4b8efc676..28045d5d49 100644 --- a/tests/Zend/Http/Client/ProxyAdapterTest.php +++ b/tests/Zend/Http/Client/ProxyAdapterTest.php @@ -47,7 +47,7 @@ class Zend_Http_Client_ProxyAdapterTest extends Zend_Http_Client_SocketTest * * @var array */ - protected function setUp(): void + protected function set_up() { if (defined('TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY') && TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY) { @@ -87,7 +87,7 @@ protected function setUp(): void 'proxy_pass' => $pass, ]; - parent::setUp(); + parent::set_up(); } else { $this->markTestSkipped("Zend_Http_Client proxy server tests are not enabled in TestConfiguration.php"); } @@ -132,7 +132,7 @@ public function testConnectHandshakeSendsCustomUserAgentHeader() // Change the adapter $this->config['adapter'] = 'ZF3189_ProxyAdapter'; $this->config['useragent'] = 'ZendTest'; - parent::setUp(); + parent::set_up(); $base = preg_replace("/^http:/", "https:", $this->baseuri); $this->client->setUri($base . 'testSimpleRequests.php'); @@ -156,7 +156,7 @@ public function testConnectHandshakeSendsCustomUserAgentHeaderWhenSetInHeaders() { // Change the adapter $this->config['adapter'] = 'ZF3189_ProxyAdapter'; - parent::setUp(); + parent::set_up(); $base = preg_replace("/^http:/", "https:", $this->baseuri); $this->client->setUri($base . 'testSimpleRequests.php'); @@ -181,7 +181,7 @@ public function testProxyAdapterDoesNotOverwriteExistingProxyAuthorizationHeader { // Change the adapter $this->config['adapter'] = 'ZF3189_ProxyAdapter'; - parent::setUp(); + parent::set_up(); $base = preg_replace("/^http:/", "https:", $this->baseuri); $this->client->setUri($base . 'testSimpleRequests.php'); diff --git a/tests/Zend/Http/Client/SkipTests.php b/tests/Zend/Http/Client/SkipTests.php index 107be0b688..e3f42de87b 100644 --- a/tests/Zend/Http/Client/SkipTests.php +++ b/tests/Zend/Http/Client/SkipTests.php @@ -1,6 +1,6 @@ markTestSkipped("Zend_Http_Client dynamic tests are not enabled in TestConfiguration.php"); } @@ -59,7 +59,7 @@ public function testSocket() */ class Zend_Http_Client_Skip_ProxyAdapterTest extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped("Zend_Http_Client proxy server tests are not enabled in TestConfiguration.php"); } diff --git a/tests/Zend/Http/Client/StaticTest.php b/tests/Zend/Http/Client/StaticTest.php index 6c103a5867..35e831cd88 100644 --- a/tests/Zend/Http/Client/StaticTest.php +++ b/tests/Zend/Http/Client/StaticTest.php @@ -1,6 +1,6 @@ _client = new Zend_Http_Client_StaticTest_Mock('http://www.example.com'); } @@ -63,7 +63,7 @@ protected function setUp(): void * Clean up after running a test * */ - protected function tearDown(): void + protected function tear_down() { $this->_client = null; } diff --git a/tests/Zend/Http/Client/TestAdapterTest.php b/tests/Zend/Http/Client/TestAdapterTest.php index 2bcef357cd..2ef5a83b39 100644 --- a/tests/Zend/Http/Client/TestAdapterTest.php +++ b/tests/Zend/Http/Client/TestAdapterTest.php @@ -1,6 +1,6 @@ adapter = new Zend_Http_Client_Adapter_Test(); } @@ -59,7 +59,7 @@ protected function setUp(): void * Tear down the test adapter after running the test * */ - protected function tearDown(): void + protected function tear_down() { $this->adapter = null; } diff --git a/tests/Zend/Http/CookieJarTest.php b/tests/Zend/Http/CookieJarTest.php index ee7d329e7c..ece25b5635 100644 --- a/tests/Zend/Http/CookieJarTest.php +++ b/tests/Zend/Http/CookieJarTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -65,6 +65,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Http_Header_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Http_Header_AllTests::main') { Zend_Http_Header_AllTests::main(); } diff --git a/tests/Zend/Http/Header/HeaderValueTest.php b/tests/Zend/Http/Header/HeaderValueTest.php index b063e177f0..c6a40590ff 100644 --- a/tests/Zend/Http/Header/HeaderValueTest.php +++ b/tests/Zend/Http/Header/HeaderValueTest.php @@ -1,6 +1,6 @@ tempFile !== null && file_exists($this->tempFile)) { unlink($this->tempFile); diff --git a/tests/Zend/Http/UserAgent/AbstractDeviceTest.php b/tests/Zend/Http/UserAgent/AbstractDeviceTest.php index b066c0b63e..4a6e4a3cc3 100644 --- a/tests/Zend/Http/UserAgent/AbstractDeviceTest.php +++ b/tests/Zend/Http/UserAgent/AbstractDeviceTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -63,6 +63,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Http_UserAgent_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Http_UserAgent_AllTests::main') { Zend_Http_UserAgent_AllTests::main(); } diff --git a/tests/Zend/Http/UserAgent/Features/Adapter/BrowscapTest.php b/tests/Zend/Http/UserAgent/Features/Adapter/BrowscapTest.php index 0e1c9e8008..d6a2ade033 100644 --- a/tests/Zend/Http/UserAgent/Features/Adapter/BrowscapTest.php +++ b/tests/Zend/Http/UserAgent/Features/Adapter/BrowscapTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $browscap = ini_get('browscap'); if (empty($browscap) || !file_exists($browscap)) { @@ -73,6 +73,6 @@ public function testGetFromRequest() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Http_UserAgent_Features_Adapter_Browscap::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Http_UserAgent_Features_Adapter_Browscap::main') { Zend_Http_UserAgent_Features_Adapter_Browscap::main(); } diff --git a/tests/Zend/Http/UserAgent/Features/Adapter/DeviceAtlasTest.php b/tests/Zend/Http/UserAgent/Features/Adapter/DeviceAtlasTest.php index 0c8497b39e..4aa349d997 100644 --- a/tests/Zend/Http/UserAgent/Features/Adapter/DeviceAtlasTest.php +++ b/tests/Zend/Http/UserAgent/Features/Adapter/DeviceAtlasTest.php @@ -1,6 +1,6 @@ markTestSkipped('Requires TERAWURFL library'); diff --git a/tests/Zend/Http/UserAgentTest.php b/tests/Zend/Http/UserAgentTest.php index c588e3bfd7..c86a25d592 100644 --- a/tests/Zend/Http/UserAgentTest.php +++ b/tests/Zend/Http/UserAgentTest.php @@ -1,6 +1,6 @@ server = []; diff --git a/tests/Zend/Json/AllTests.php b/tests/Zend/Json/AllTests.php index e35455643b..34ffb887c8 100644 --- a/tests/Zend/Json/AllTests.php +++ b/tests/Zend/Json/AllTests.php @@ -44,7 +44,7 @@ class Zend_Json_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Json_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Json_AllTests::main') { Zend_Json_AllTests::main(); } diff --git a/tests/Zend/Json/JsonXMLTest.php b/tests/Zend/Json/JsonXMLTest.php index c961928dfc..bd596e55ca 100644 --- a/tests/Zend/Json/JsonXMLTest.php +++ b/tests/Zend/Json/JsonXMLTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -65,6 +65,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Json_Server_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Json_Server_AllTests::main') { Zend_Json_Server_AllTests::main(); } diff --git a/tests/Zend/Json/Server/CacheTest.php b/tests/Zend/Json/Server/CacheTest.php index e51d02b29e..67ac9d684e 100644 --- a/tests/Zend/Json/Server/CacheTest.php +++ b/tests/Zend/Json/Server/CacheTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,7 +73,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->server = new Zend_Json_Server(); $this->server->setClass('Zend_Json_Server_CacheTest_Foo', 'foo'); @@ -95,7 +95,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { if (file_exists($this->cacheFile)) { unlink($this->cacheFile); @@ -163,6 +163,6 @@ public function baz() // Call Zend_Json_Server_CacheTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Json_Server_CacheTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Json_Server_CacheTest::main") { Zend_Json_Server_CacheTest::main(); } diff --git a/tests/Zend/Json/Server/ErrorTest.php b/tests/Zend/Json/Server/ErrorTest.php index 2b10a47628..c90eaa6aa6 100644 --- a/tests/Zend/Json/Server/ErrorTest.php +++ b/tests/Zend/Json/Server/ErrorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->error = new Zend_Json_Server_Error(); } @@ -79,7 +79,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -190,6 +190,6 @@ public function validateArray($error) } // Call Zend_Json_Server_ErrorTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Json_Server_ErrorTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Json_Server_ErrorTest::main") { Zend_Json_Server_ErrorTest::main(); } diff --git a/tests/Zend/Json/Server/RequestTest.php b/tests/Zend/Json/Server/RequestTest.php index ed8bc1f291..efc2251bb8 100644 --- a/tests/Zend/Json/Server/RequestTest.php +++ b/tests/Zend/Json/Server/RequestTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -66,7 +66,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->request = new Zend_Json_Server_Request(); } @@ -77,7 +77,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -305,6 +305,6 @@ public function validateJson($json, array $options) } // Call Zend_Json_Server_RequestTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Json_Server_RequestTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Json_Server_RequestTest::main") { Zend_Json_Server_RequestTest::main(); } diff --git a/tests/Zend/Json/Server/ResponseTest.php b/tests/Zend/Json/Server/ResponseTest.php index 9c2c2af32f..882bfc596d 100644 --- a/tests/Zend/Json/Server/ResponseTest.php +++ b/tests/Zend/Json/Server/ResponseTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -69,7 +69,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->response = new Zend_Json_Server_Response(); } @@ -80,7 +80,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -202,6 +202,6 @@ public function testCastToStringShouldCastToJson() } // Call Zend_Json_Server_ResponseTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Json_Server_ResponseTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Json_Server_ResponseTest::main") { Zend_Json_Server_ResponseTest::main(); } diff --git a/tests/Zend/Json/Server/Smd/ServiceTest.php b/tests/Zend/Json/Server/Smd/ServiceTest.php index 548bf85e77..4e48148c3a 100644 --- a/tests/Zend/Json/Server/Smd/ServiceTest.php +++ b/tests/Zend/Json/Server/Smd/ServiceTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -69,7 +69,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->service = new Zend_Json_Server_Smd_Service('foo'); } @@ -80,7 +80,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -385,6 +385,6 @@ public function validateSmdArray(array $smd) } // Call Zend_Json_Server_Smd_ServiceTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Json_Server_Smd_ServiceTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Json_Server_Smd_ServiceTest::main") { Zend_Json_Server_Smd_ServiceTest::main(); } diff --git a/tests/Zend/Json/Server/SmdTest.php b/tests/Zend/Json/Server/SmdTest.php index da28e63bfd..5f3dbfec93 100644 --- a/tests/Zend/Json/Server/SmdTest.php +++ b/tests/Zend/Json/Server/SmdTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -69,7 +69,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->smd = new Zend_Json_Server_Smd(); } @@ -80,7 +80,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -434,6 +434,6 @@ public function validateServiceArray(array $smd, array $options) } // Call Zend_Json_Server_SmdTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Json_Server_SmdTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Json_Server_SmdTest::main") { Zend_Json_Server_SmdTest::main(); } diff --git a/tests/Zend/Json/ServerTest.php b/tests/Zend/Json/ServerTest.php index f7257ad8dd..84dcda45e4 100644 --- a/tests/Zend/Json/ServerTest.php +++ b/tests/Zend/Json/ServerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -71,7 +71,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->server = new Zend_Json_Server(); } @@ -82,7 +82,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -525,6 +525,6 @@ function Zend_Json_ServerTest_FooFunc() } // Call Zend_Json_ServerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Json_ServerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Json_ServerTest::main") { Zend_Json_ServerTest::main(); } diff --git a/tests/Zend/JsonTest.php b/tests/Zend/JsonTest.php index 945a38cdc3..89de79c333 100644 --- a/tests/Zend/JsonTest.php +++ b/tests/Zend/JsonTest.php @@ -1,6 +1,6 @@ _originalUseBuiltinEncoderDecoderValue = Zend_Json::$useBuiltinEncoderDecoder; } - protected function tearDown(): void + protected function tear_down() { Zend_Json::$useBuiltinEncoderDecoder = $this->_originalUseBuiltinEncoderDecoderValue; } diff --git a/tests/Zend/Layout/AllTests.php b/tests/Zend/Layout/AllTests.php index 6fdb82cf0f..a17daf59a5 100644 --- a/tests/Zend/Layout/AllTests.php +++ b/tests/Zend/Layout/AllTests.php @@ -45,7 +45,7 @@ class Zend_Layout_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -61,6 +61,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Layout_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Layout_AllTests::main') { Zend_Layout_AllTests::main(); } diff --git a/tests/Zend/Layout/FunctionalTest.php b/tests/Zend/Layout/FunctionalTest.php index 60d83683dc..b37405b12e 100644 --- a/tests/Zend/Layout/FunctionalTest.php +++ b/tests/Zend/Layout/FunctionalTest.php @@ -51,13 +51,13 @@ class Zend_Layout_FunctionalTest extends Zend_Test_PHPUnit_ControllerTestCase public static function main() { $suite = new TestSuite(__CLASS__); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->bootstrap = [$this, 'appBootstrap']; - parent::setUp(); + parent::set_up(); } public function appBootstrap() @@ -90,6 +90,6 @@ public function testMissingViewScriptDoesDoubleRender() } // Call Zend_Layout_FunctionalTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Layout_FunctionalTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Layout_FunctionalTest::main") { Zend_Layout_FunctionalTest::main(); } diff --git a/tests/Zend/Layout/HelperTest.php b/tests/Zend/Layout/HelperTest.php index 04f63ea7ef..cc1ab70ca9 100644 --- a/tests/Zend/Layout/HelperTest.php +++ b/tests/Zend/Layout/HelperTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -64,7 +64,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Layout_HelperTest_Layout::resetMvcInstance(); Zend_Controller_Front::getInstance()->resetInstance(); @@ -82,7 +82,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -157,6 +157,6 @@ public static function resetMvcInstance() } // Call Zend_Layout_HelperTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Layout_HelperTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Layout_HelperTest::main") { Zend_Layout_HelperTest::main(); } diff --git a/tests/Zend/Layout/LayoutTest.php b/tests/Zend/Layout/LayoutTest.php index ca9fc25195..8f2c18ed00 100644 --- a/tests/Zend/Layout/LayoutTest.php +++ b/tests/Zend/Layout/LayoutTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Layout_LayoutTest_Override::resetMvcInstance(); @@ -87,7 +87,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { Zend_Layout::resetMvcInstance(); } @@ -582,6 +582,6 @@ class Zend_Layout_LayoutTest_Controller_Action_Helper_Layout extends Zend_Layout } // Call Zend_Layout_LayoutTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Layout_LayoutTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Layout_LayoutTest::main") { Zend_Layout_LayoutTest::main(); } diff --git a/tests/Zend/Layout/PluginTest.php b/tests/Zend/Layout/PluginTest.php index 44867fb055..242611e606 100644 --- a/tests/Zend/Layout/PluginTest.php +++ b/tests/Zend/Layout/PluginTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -66,7 +66,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Controller_Front::getInstance()->resetInstance(); @@ -86,7 +86,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { Zend_Layout::resetMvcInstance(); } @@ -245,6 +245,6 @@ public static function resetMvcInstance() } // Call Zend_Layout_PluginTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Layout_PluginTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Layout_PluginTest::main") { Zend_Layout_PluginTest::main(); } diff --git a/tests/Zend/Ldap/AllTests.php b/tests/Zend/Ldap/AllTests.php index 5a0dafc6ba..fcc5d4ff0e 100644 --- a/tests/Zend/Ldap/AllTests.php +++ b/tests/Zend/Ldap/AllTests.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -102,7 +102,7 @@ public static function suite() */ class Zend_Ldap_SkipOnlineTests extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped('Zend_Ldap online tests not enabled in TestConfiguration.php'); } @@ -115,6 +115,6 @@ public function testNothing() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Ldap_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Ldap_AllTests::main') { Zend_Ldap_AllTests::main(); } diff --git a/tests/Zend/Ldap/AttributeTest.php b/tests/Zend/Ldap/AttributeTest.php index e5cb569b02..d0607e13f9 100644 --- a/tests/Zend/Ldap/AttributeTest.php +++ b/tests/Zend/Ldap/AttributeTest.php @@ -1,6 +1,6 @@ _options = [ 'host' => TESTS_ZEND_LDAP_HOST, diff --git a/tests/Zend/Ldap/CanonTest.php b/tests/Zend/Ldap/CanonTest.php index c0a691e382..fa72a92210 100644 --- a/tests/Zend/Ldap/CanonTest.php +++ b/tests/Zend/Ldap/CanonTest.php @@ -1,6 +1,6 @@ _options = [ 'host' => TESTS_ZEND_LDAP_HOST, diff --git a/tests/Zend/Ldap/ConnectTest.php b/tests/Zend/Ldap/ConnectTest.php index 0bd1868e9b..e71ebb8bfb 100644 --- a/tests/Zend/Ldap/ConnectTest.php +++ b/tests/Zend/Ldap/ConnectTest.php @@ -1,6 +1,6 @@ _options = ['host' => TESTS_ZEND_LDAP_HOST]; if (defined('TESTS_ZEND_LDAP_PORT') && TESTS_ZEND_LDAP_PORT != 389) { diff --git a/tests/Zend/Ldap/ConverterTest.php b/tests/Zend/Ldap/ConverterTest.php index a3b2a79d60..5059ac3cb8 100644 --- a/tests/Zend/Ldap/ConverterTest.php +++ b/tests/Zend/Ldap/ConverterTest.php @@ -1,6 +1,6 @@ _prepareLdapServer(); $this->_orgDn = $this->_createDn('ou=OrgTest,'); @@ -101,7 +101,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { if ($this->_getLdap()->exists($this->_newDn)) { $this->_getLdap()->delete($this->_newDn, false); @@ -121,7 +121,7 @@ protected function tearDown(): void $this->_cleanupLdapServer(); - parent::tearDown(); + parent::tear_down(); } public function testSimpleLeafRename() diff --git a/tests/Zend/Ldap/Dn/AllTests.php b/tests/Zend/Ldap/Dn/AllTests.php index ea8d3dcc26..20b99b389b 100644 --- a/tests/Zend/Ldap/Dn/AllTests.php +++ b/tests/Zend/Ldap/Dn/AllTests.php @@ -48,7 +48,7 @@ class Zend_Ldap_Dn_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -66,6 +66,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Ldap_Dn_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Ldap_Dn_AllTests::main') { Zend_Ldap_Dn_AllTests::main(); } diff --git a/tests/Zend/Ldap/Dn/CreationTest.php b/tests/Zend/Ldap/Dn/CreationTest.php index e3ec70e711..d22d1c9007 100644 --- a/tests/Zend/Ldap/Dn/CreationTest.php +++ b/tests/Zend/Ldap/Dn/CreationTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -67,7 +67,7 @@ public static function suite() class Zend_Ldap_Ldif_SkipOnlineTests extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped('Zend_Ldap_Ldif online tests not enabled in TestConfiguration.php'); } @@ -77,6 +77,6 @@ public function testNothing() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Ldap_Ldif_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Ldap_Ldif_AllTests::main') { Zend_Ldap_Ldif_AllTests::main(); } diff --git a/tests/Zend/Ldap/Node/AllTests.php b/tests/Zend/Ldap/Node/AllTests.php index 1ecee5d59b..666efffaa8 100644 --- a/tests/Zend/Ldap/Node/AllTests.php +++ b/tests/Zend/Ldap/Node/AllTests.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -83,7 +83,7 @@ public static function suite() class Zend_Ldap_Node_SkipOnlineTests extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped('Zend_Ldap_Node online tests not enabled in TestConfiguration.php'); } @@ -93,6 +93,6 @@ public function testNothing() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Ldap_Node_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Ldap_Node_AllTests::main') { Zend_Ldap_Node_AllTests::main(); } diff --git a/tests/Zend/Ldap/Node/ChildrenIterationTest.php b/tests/Zend/Ldap/Node/ChildrenIterationTest.php index 1c1cfe62ad..d8aeda56b7 100644 --- a/tests/Zend/Ldap/Node/ChildrenIterationTest.php +++ b/tests/Zend/Ldap/Node/ChildrenIterationTest.php @@ -40,16 +40,16 @@ */ class Zend_Ldap_Node_ChildrenIterationTest extends Zend_Ldap_OnlineTestCase { - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); $this->_prepareLdapServer(); } - protected function tearDown(): void + protected function tear_down() { $this->_cleanupLdapServer(); - parent::tearDown(); + parent::tear_down(); } public function testSimpleIteration() diff --git a/tests/Zend/Ldap/Node/ChildrenTest.php b/tests/Zend/Ldap/Node/ChildrenTest.php index c2e094caed..295e1c60ee 100644 --- a/tests/Zend/Ldap/Node/ChildrenTest.php +++ b/tests/Zend/Ldap/Node/ChildrenTest.php @@ -40,16 +40,16 @@ */ class Zend_Ldap_Node_ChildrenTest extends Zend_Ldap_OnlineTestCase { - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); $this->_prepareLdapServer(); } - protected function tearDown(): void + protected function tear_down() { $this->_cleanupLdapServer(); - parent::tearDown(); + parent::tear_down(); } public function testGetChildrenOnAttachedNode() diff --git a/tests/Zend/Ldap/Node/OnlineTest.php b/tests/Zend/Ldap/Node/OnlineTest.php index b9533b9517..27aa5d939c 100644 --- a/tests/Zend/Ldap/Node/OnlineTest.php +++ b/tests/Zend/Ldap/Node/OnlineTest.php @@ -40,16 +40,16 @@ */ class Zend_Ldap_Node_OnlineTest extends Zend_Ldap_OnlineTestCase { - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); $this->_prepareLdapServer(); } - protected function tearDown(): void + protected function tear_down() { $this->_cleanupLdapServer(); - parent::tearDown(); + parent::tear_down(); } public function testLoadFromLdap() diff --git a/tests/Zend/Ldap/Node/SchemaTest.php b/tests/Zend/Ldap/Node/SchemaTest.php index 097c76c725..eb6816fefe 100644 --- a/tests/Zend/Ldap/Node/SchemaTest.php +++ b/tests/Zend/Ldap/Node/SchemaTest.php @@ -41,9 +41,9 @@ class Zend_Ldap_Node_SchemaTest extends Zend_Ldap_OnlineTestCase */ private $_schema; - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); $this->_schema = $this->_getLdap()->getSchema(); } diff --git a/tests/Zend/Ldap/Node/UpdateTest.php b/tests/Zend/Ldap/Node/UpdateTest.php index ed2cf8e000..28ff2cb2f2 100644 --- a/tests/Zend/Ldap/Node/UpdateTest.php +++ b/tests/Zend/Ldap/Node/UpdateTest.php @@ -40,19 +40,19 @@ */ class Zend_Ldap_Node_UpdateTest extends Zend_Ldap_OnlineTestCase { - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); $this->_prepareLdapServer(); } - protected function tearDown(): void + protected function tear_down() { foreach ($this->_getLdap()->getBaseNode()->searchChildren('objectClass=*') as $child) { $this->_getLdap()->delete($child->getDn(), true); } - parent::tearDown(); + parent::tear_down(); } protected function _stripActiveDirectorySystemAttributes(&$entry) diff --git a/tests/Zend/Ldap/OfflineTest.php b/tests/Zend/Ldap/OfflineTest.php index 95ddc071ed..86a8c9cb2a 100644 --- a/tests/Zend/Ldap/OfflineTest.php +++ b/tests/Zend/Ldap/OfflineTest.php @@ -1,6 +1,6 @@ markTestSkipped('LDAP is not enabled'); diff --git a/tests/Zend/Ldap/OnlineTestCase.php b/tests/Zend/Ldap/OnlineTestCase.php index 5cda6babe7..598d5b8645 100644 --- a/tests/Zend/Ldap/OnlineTestCase.php +++ b/tests/Zend/Ldap/OnlineTestCase.php @@ -57,7 +57,7 @@ protected function _getLdap() return $this->_ldap; } - protected function setUp(): void + protected function set_up() { if (!TESTS_ZEND_LDAP_ONLINE_ENABLED) { $this->markTestSkipped("Test skipped due to test configuration"); @@ -96,7 +96,7 @@ protected function setUp(): void $this->_ldap->bind(); } - protected function tearDown(): void + protected function tear_down() { if ($this->_ldap !== null) { $this->_ldap->disconnect(); diff --git a/tests/Zend/Ldap/OriginalBindTest.php b/tests/Zend/Ldap/OriginalBindTest.php index 9081a1350e..d2220ad661 100644 --- a/tests/Zend/Ldap/OriginalBindTest.php +++ b/tests/Zend/Ldap/OriginalBindTest.php @@ -1,6 +1,6 @@ _options = [ 'host' => TESTS_ZEND_LDAP_HOST, diff --git a/tests/Zend/Ldap/OriginalCanonTest.php b/tests/Zend/Ldap/OriginalCanonTest.php index 8843950152..4aa59521ad 100644 --- a/tests/Zend/Ldap/OriginalCanonTest.php +++ b/tests/Zend/Ldap/OriginalCanonTest.php @@ -1,6 +1,6 @@ _options = [ 'host' => TESTS_ZEND_LDAP_HOST, diff --git a/tests/Zend/Ldap/OriginalConnectTest.php b/tests/Zend/Ldap/OriginalConnectTest.php index 26188a2da8..87afa864cc 100644 --- a/tests/Zend/Ldap/OriginalConnectTest.php +++ b/tests/Zend/Ldap/OriginalConnectTest.php @@ -1,6 +1,6 @@ _options = ['host' => TESTS_ZEND_LDAP_HOST]; if (defined('TESTS_ZEND_LDAP_PORT') && TESTS_ZEND_LDAP_PORT != 389) { diff --git a/tests/Zend/Ldap/OriginalOfflineTest.php b/tests/Zend/Ldap/OriginalOfflineTest.php index c82311ac0d..883b0da128 100644 --- a/tests/Zend/Ldap/OriginalOfflineTest.php +++ b/tests/Zend/Ldap/OriginalOfflineTest.php @@ -1,6 +1,6 @@ _ldap = new Zend_Ldap(); } diff --git a/tests/Zend/Ldap/SearchTest.php b/tests/Zend/Ldap/SearchTest.php index 9a209002fe..3d9894ecc3 100644 --- a/tests/Zend/Ldap/SearchTest.php +++ b/tests/Zend/Ldap/SearchTest.php @@ -44,16 +44,16 @@ */ class Zend_Ldap_SearchTest extends Zend_Ldap_OnlineTestCase { - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); $this->_prepareLdapServer(); } - protected function tearDown(): void + protected function tear_down() { $this->_cleanupLdapServer(); - parent::tearDown(); + parent::tear_down(); } public function testGetSingleEntry() diff --git a/tests/Zend/Ldap/SortTest.php b/tests/Zend/Ldap/SortTest.php index ad99374c62..0c03f089ca 100644 --- a/tests/Zend/Ldap/SortTest.php +++ b/tests/Zend/Ldap/SortTest.php @@ -30,16 +30,16 @@ */ class Zend_Ldap_SortTest extends Zend_Ldap_OnlineTestCase { - protected function setUp() + protected function set_up() { - parent::setUp(); + parent::set_up(); $this->_prepareLdapServer(); } - protected function tearDown() + protected function tear_down() { $this->_cleanupLdapServer(); - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/Zend/Ldap/TestCase.php b/tests/Zend/Ldap/TestCase.php index 03028d10e9..eeef86ef32 100644 --- a/tests/Zend/Ldap/TestCase.php +++ b/tests/Zend/Ldap/TestCase.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -69,6 +69,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Loader_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Loader_AllTests::main') { Zend_Loader_AllTests::main(); } diff --git a/tests/Zend/Loader/Autoloader/ResourceTest.php b/tests/Zend/Loader/Autoloader/ResourceTest.php index fbbe15f645..eb60f4d4aa 100644 --- a/tests/Zend/Loader/Autoloader/ResourceTest.php +++ b/tests/Zend/Loader/Autoloader/ResourceTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -113,7 +113,7 @@ protected function setUp(): void ]); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -477,6 +477,6 @@ public function testMatchesMultiLevelNamespaces() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Loader_Autoloader_ResourceTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Loader_Autoloader_ResourceTest::main') { Zend_Loader_Autoloader_ResourceTest::main(); } diff --git a/tests/Zend/Loader/AutoloaderFactoryClassMapLoaderTest.php b/tests/Zend/Loader/AutoloaderFactoryClassMapLoaderTest.php index 6e927b4038..60f6b9a2f5 100644 --- a/tests/Zend/Loader/AutoloaderFactoryClassMapLoaderTest.php +++ b/tests/Zend/Loader/AutoloaderFactoryClassMapLoaderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->_loaders = spl_autoload_functions(); @@ -75,7 +75,7 @@ protected function setUp(): void $this->_includePath = get_include_path(); } - protected function tearDown(): void + protected function tear_down() { Zend_Loader_AutoloaderFactory::unregisterAutoloaders(); // Restore original autoloaders @@ -112,6 +112,6 @@ public function testAutoincluding() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Loader_AutoloaderFactoryClassMapLoaderTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Loader_AutoloaderFactoryClassMapLoaderTest::main') { Zend_Loader_AutoloaderFactoryClassMapLoaderTest::main(); } diff --git a/tests/Zend/Loader/AutoloaderFactoryTest.php b/tests/Zend/Loader/AutoloaderFactoryTest.php index 8c54f3737d..f7782d2a8b 100644 --- a/tests/Zend/Loader/AutoloaderFactoryTest.php +++ b/tests/Zend/Loader/AutoloaderFactoryTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -81,7 +81,7 @@ protected function setUp(): void $this->includePath = get_include_path(); } - protected function tearDown(): void + protected function tear_down() { Zend_Loader_AutoloaderFactory::unregisterAutoloaders(); // Restore original autoloaders @@ -242,6 +242,6 @@ public function testPassingNoArgumentsToFactoryInstantiatesAndRegistersStandardA } } -if (PHPUnit_MAIN_METHOD == 'Zend_Loader_AutoloaderFactoryTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Loader_AutoloaderFactoryTest::main') { Zend_Loader_AutoloaderFactoryTest::main(); } diff --git a/tests/Zend/Loader/AutoloaderMultiVersionTest.php b/tests/Zend/Loader/AutoloaderMultiVersionTest.php index f6b1ca19d7..64a4cb0b0f 100644 --- a/tests/Zend/Loader/AutoloaderMultiVersionTest.php +++ b/tests/Zend/Loader/AutoloaderMultiVersionTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -116,7 +116,7 @@ protected function setUp(): void $this->autoloader = Zend_Loader_Autoloader::getInstance(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -258,6 +258,6 @@ protected function _getVersion($version, $type) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Loader_AutoloaderMultiVersionTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Loader_AutoloaderMultiVersionTest::main') { Zend_Loader_AutoloaderMultiVersionTest::main(); } diff --git a/tests/Zend/Loader/AutoloaderTest.php b/tests/Zend/Loader/AutoloaderTest.php index ce6255a423..5a02546b7d 100644 --- a/tests/Zend/Loader/AutoloaderTest.php +++ b/tests/Zend/Loader/AutoloaderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -95,7 +95,7 @@ protected function setUp(): void $this->error = null; } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -477,6 +477,6 @@ public function autoload($class) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Loader_AutoloaderTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Loader_AutoloaderTest::main') { Zend_Loader_AutoloaderTest::main(); } diff --git a/tests/Zend/Loader/ClassMapAutoloaderTest.php b/tests/Zend/Loader/ClassMapAutoloaderTest.php index 553b81fb26..fdc56ccab9 100644 --- a/tests/Zend/Loader/ClassMapAutoloaderTest.php +++ b/tests/Zend/Loader/ClassMapAutoloaderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -78,7 +78,7 @@ protected function setUp(): void $this->loader = new Zend_Loader_ClassMapAutoloader(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -247,6 +247,6 @@ public function testCanLoadNamespacedClassFromPhar() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Loader_ClassMapAutoloaderTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Loader_ClassMapAutoloaderTest::main') { Zend_Loader_ClassMapAutoloaderTest::main(); } diff --git a/tests/Zend/Loader/PluginLoaderTest.php b/tests/Zend/Loader/PluginLoaderTest.php index 775bafdc87..c61ee00d7e 100644 --- a/tests/Zend/Loader/PluginLoaderTest.php +++ b/tests/Zend/Loader/PluginLoaderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,7 +73,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (file_exists((string) $this->_includeCache)) { unlink($this->_includeCache); @@ -90,7 +90,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { $this->clearStaticPaths(); Zend_Loader_PluginLoader::setIncludeFileCache(null); diff --git a/tests/Zend/Loader/StandardAutoloaderTest.php b/tests/Zend/Loader/StandardAutoloaderTest.php index 673b096b18..616bd47f50 100644 --- a/tests/Zend/Loader/StandardAutoloaderTest.php +++ b/tests/Zend/Loader/StandardAutoloaderTest.php @@ -1,6 +1,6 @@ loaders = spl_autoload_functions(); @@ -64,7 +64,7 @@ protected function setUp(): void $this->includePath = get_include_path(); } - protected function tearDown(): void + protected function tear_down() { // Restore original autoloaders $loaders = spl_autoload_functions(); @@ -235,6 +235,6 @@ public function testCanTellAutoloaderToRegisterZfPrefixAtInstantiation() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Loader_StandardAutoloaderTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Loader_StandardAutoloaderTest::main') { Zend_Loader_StandardAutoloaderTest::main(); } diff --git a/tests/Zend/LoaderTest.php b/tests/Zend/LoaderTest.php index c5c89bbd5f..18b161194e 100644 --- a/tests/Zend/LoaderTest.php +++ b/tests/Zend/LoaderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { // Store original autoloaders $this->loaders = spl_autoload_functions(); @@ -99,7 +99,7 @@ protected function setUp(): void Zend_Loader_Autoloader::resetInstance(); } - protected function tearDown(): void + protected function tear_down() { if ($this->errorHandler !== null) { restore_error_handler(); diff --git a/tests/Zend/Locale/AllTests.php b/tests/Zend/Locale/AllTests.php index c8cfd9377d..d4b70d292c 100644 --- a/tests/Zend/Locale/AllTests.php +++ b/tests/Zend/Locale/AllTests.php @@ -53,7 +53,7 @@ public static function main() setlocale(LC_ALL, TESTS_ZEND_LOCALE_FORMAT_SETLOCALE); } - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -68,6 +68,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Locale_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Locale_AllTests::main') { Zend_Locale_AllTests::main(); } diff --git a/tests/Zend/Locale/DataTest.php b/tests/Zend/Locale/DataTest.php index 481432d6c2..42cf9bb5a2 100644 --- a/tests/Zend/Locale/DataTest.php +++ b/tests/Zend/Locale/DataTest.php @@ -1,6 +1,6 @@ _cache = Zend_Cache::factory( @@ -54,7 +54,7 @@ protected function setUp(): void } - protected function tearDown(): void + protected function tear_down() { $this->_cache->clean(Zend_Cache::CLEANING_MODE_ALL); } diff --git a/tests/Zend/Locale/FormatTest.php b/tests/Zend/Locale/FormatTest.php index b3ab09d607..7330f1d657 100644 --- a/tests/Zend/Locale/FormatTest.php +++ b/tests/Zend/Locale/FormatTest.php @@ -1,7 +1,7 @@ run($suite); + $result = (new resources_Runner())->run($suite); } private $_cache = null; @@ -65,7 +65,7 @@ public static function main() private $_errorOccurred = null; - protected function setUp(): void + protected function set_up() { $this->_locale = setlocale(LC_ALL, 0); setlocale(LC_ALL, 'de'); @@ -84,7 +84,7 @@ protected function setUp(): void putenv("HTTP_ACCEPT_LANGUAGE=,de,en-UK-US;q=0.5,fr_FR;q=0.2"); } - protected function tearDown(): void + protected function tear_down() { if ($this->errorHandler) { restore_error_handler(); @@ -102,7 +102,7 @@ protected function tearDown(): void setlocale(LC_ALL, $this->_locale); } - public static function tearDownAfterClass(): void + public static function tear_down_after_class() { /** * Fix issue side effect Zend_Locale::$_auto cached when run @@ -997,6 +997,6 @@ public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $e } // Call Zend_LocaleTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_LocaleTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_LocaleTest::main") { Zend_LocaleTest::main(); } diff --git a/tests/Zend/Log/AllTests.php b/tests/Zend/Log/AllTests.php index a3e22fa3a5..1aea47c2fe 100644 --- a/tests/Zend/Log/AllTests.php +++ b/tests/Zend/Log/AllTests.php @@ -45,7 +45,7 @@ class Zend_Log_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -61,6 +61,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_AllTests::main') { Zend_Log_AllTests::main(); } diff --git a/tests/Zend/Log/Filter/AllTests.php b/tests/Zend/Log/Filter/AllTests.php index 3124891fdb..4a9828bd17 100644 --- a/tests/Zend/Log/Filter/AllTests.php +++ b/tests/Zend/Log/Filter/AllTests.php @@ -46,7 +46,7 @@ class Zend_Log_Filter_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -62,6 +62,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Filter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Filter_AllTests::main') { Zend_Log_Filter_AllTests::main(); } diff --git a/tests/Zend/Log/Filter/ChainingTest.php b/tests/Zend/Log/Filter/ChainingTest.php index 4fcd2a4cad..79d3941628 100644 --- a/tests/Zend/Log/Filter/ChainingTest.php +++ b/tests/Zend/Log/Filter/ChainingTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->log = fopen('php://memory', 'w'); $this->logger = new Zend_Log(); $this->logger->addWriter(new Zend_Log_Writer_Stream($this->log)); } - protected function tearDown(): void + protected function tear_down() { fclose($this->log); } @@ -111,6 +111,6 @@ public function testFilterOnSpecificWriter() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Filter_ChainingTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Filter_ChainingTest::main') { Zend_Log_Filter_ChainingTest::main(); } diff --git a/tests/Zend/Log/Filter/MessageTest.php b/tests/Zend/Log/Filter/MessageTest.php index 242117b8bb..bff54fcac1 100644 --- a/tests/Zend/Log/Filter/MessageTest.php +++ b/tests/Zend/Log/Filter/MessageTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testMessageFilterRecognizesInvalidRegularExpression() @@ -99,6 +99,6 @@ public function testFactoryWithConfig() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Filter_MessageTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Filter_MessageTest::main') { Zend_Log_Filter_MessageTest::main(); } diff --git a/tests/Zend/Log/Filter/PriorityTest.php b/tests/Zend/Log/Filter/PriorityTest.php index 4ad9cb5ef2..437e4970f6 100644 --- a/tests/Zend/Log/Filter/PriorityTest.php +++ b/tests/Zend/Log/Filter/PriorityTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testComparisonDefaultsToLessThanOrEqual() @@ -109,6 +109,6 @@ public function testFactory() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Filter_PriorityTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Filter_PriorityTest::main') { Zend_Log_Filter_PriorityTest::main(); } diff --git a/tests/Zend/Log/Filter/SuppressTest.php b/tests/Zend/Log/Filter/SuppressTest.php index 36ccf4a4fa..f8bf8dee26 100644 --- a/tests/Zend/Log/Filter/SuppressTest.php +++ b/tests/Zend/Log/Filter/SuppressTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->filter = new Zend_Log_Filter_Suppress(); } @@ -102,6 +102,6 @@ public function testFactory() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Filter_SuppressTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Filter_SuppressTest::main') { Zend_Log_Filter_SuppressTest::main(); } diff --git a/tests/Zend/Log/Formatter/AllTests.php b/tests/Zend/Log/Formatter/AllTests.php index f5aef495c6..8e5a1373d0 100644 --- a/tests/Zend/Log/Formatter/AllTests.php +++ b/tests/Zend/Log/Formatter/AllTests.php @@ -45,7 +45,7 @@ class Zend_Log_Formatter_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -60,6 +60,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Formatter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Formatter_AllTests::main') { Zend_Log_Formatter_AllTests::main(); } diff --git a/tests/Zend/Log/Formatter/FirebugTest.php b/tests/Zend/Log/Formatter/FirebugTest.php index 0afeacf1f6..4506c45e57 100644 --- a/tests/Zend/Log/Formatter/FirebugTest.php +++ b/tests/Zend/Log/Formatter/FirebugTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testFormat() @@ -73,6 +73,6 @@ public function testFactory() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Formatter_FirebugTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Formatter_FirebugTest::main') { Zend_Log_Formatter_FirebugTest::main(); } diff --git a/tests/Zend/Log/Formatter/SimpleTest.php b/tests/Zend/Log/Formatter/SimpleTest.php index 2447f7878b..beac5d92d5 100644 --- a/tests/Zend/Log/Formatter/SimpleTest.php +++ b/tests/Zend/Log/Formatter/SimpleTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testConstructorThrowsOnBadFormatString() @@ -142,6 +142,6 @@ class Zend_Log_Formatter_SimpleTest_TestObject2 { } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Formatter_SimpleTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Formatter_SimpleTest::main') { Zend_Log_Formatter_SimpleTest::main(); } diff --git a/tests/Zend/Log/Formatter/XmlTest.php b/tests/Zend/Log/Formatter/XmlTest.php index c1196cb85e..f418fe8c97 100644 --- a/tests/Zend/Log/Formatter/XmlTest.php +++ b/tests/Zend/Log/Formatter/XmlTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testDefaultFormat() @@ -194,6 +194,6 @@ public function __toString() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Formatter_XmlTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Formatter_XmlTest::main') { Zend_Log_Formatter_XmlTest::main(); } diff --git a/tests/Zend/Log/LogTest.php b/tests/Zend/Log/LogTest.php index 95d087a12b..17c554ecda 100644 --- a/tests/Zend/Log/LogTest.php +++ b/tests/Zend/Log/LogTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->log = fopen('php://memory', 'w+'); $this->writer = new Zend_Log_Writer_Stream($this->log); @@ -643,6 +643,6 @@ class ZLTest_My_LogNotExtending { } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_LogTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_LogTest::main') { Zend_Log_LogTest::main(); } diff --git a/tests/Zend/Log/Writer/AbstractTest.php b/tests/Zend/Log/Writer/AbstractTest.php index a452432f34..ac86f755e4 100644 --- a/tests/Zend/Log/Writer/AbstractTest.php +++ b/tests/Zend/Log/Writer/AbstractTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_writer = new Zend_Log_Writer_AbstractTest_Concrete(); } @@ -106,6 +106,6 @@ public static function factory($config) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_AbstractTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Writer_AbstractTest::main') { Zend_Log_Writer_AbstractTest::main(); } diff --git a/tests/Zend/Log/Writer/AllTests.php b/tests/Zend/Log/Writer/AllTests.php index ececbed4d4..5ec13547a9 100644 --- a/tests/Zend/Log/Writer/AllTests.php +++ b/tests/Zend/Log/Writer/AllTests.php @@ -53,7 +53,7 @@ class Zend_Log_Writer_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -76,6 +76,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Writer_AllTests::main') { Zend_Log_Writer_AllTests::main(); } diff --git a/tests/Zend/Log/Writer/DbTest.php b/tests/Zend/Log/Writer/DbTest.php index c9a883f6df..a338fcc134 100644 --- a/tests/Zend/Log/Writer/DbTest.php +++ b/tests/Zend/Log/Writer/DbTest.php @@ -1,7 +1,7 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->tableName = 'db-table-name'; @@ -267,6 +267,6 @@ public function __call($method, $params) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_DbTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Writer_DbTest::main') { Zend_Log_Writer_DbTest::main(); } diff --git a/tests/Zend/Log/Writer/FirebugTest.php b/tests/Zend/Log/Writer/FirebugTest.php index 52b7132a98..591fff582c 100644 --- a/tests/Zend/Log/Writer/FirebugTest.php +++ b/tests/Zend/Log/Writer/FirebugTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { date_default_timezone_set('America/Los_Angeles'); @@ -104,7 +104,7 @@ protected function setUp(): void Zend_Wildfire_Plugin_FirePhp::getInstance()->setOption('includeLineNumbers', false); } - protected function tearDown(): void + protected function tear_down() { Zend_Wildfire_Channel_HttpHeaders::destroyInstance(); Zend_Wildfire_Plugin_FirePhp::destroyInstance(); @@ -443,6 +443,6 @@ public function verifyHeaders($headers) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_FirebugTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Writer_FirebugTest::main') { Zend_Log_Writer_FirebugTest::main(); } diff --git a/tests/Zend/Log/Writer/MailTest.php b/tests/Zend/Log/Writer/MailTest.php index 8965d2794f..cce4eb064f 100644 --- a/tests/Zend/Log/Writer/MailTest.php +++ b/tests/Zend/Log/Writer/MailTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_transport = $this->getMockForAbstractClass( Zend_Mail_Transport_Abstract::class, @@ -89,7 +89,7 @@ protected function setUp(): void Zend_Mail::setDefaultTransport($this->_transport); } - protected function tearDown(): void + protected function tear_down() { Zend_Mail::clearDefaultTransport(); } @@ -252,8 +252,8 @@ public function testSetLayoutFormatterWithoutLayout() */ public function testDestructorMailError() { - $this->expectError(); - $this->expectErrorMessage('unable to send log entries via email;'); + $this->expectException(version_compare(phpversion(), '7.1', '>') ? \PHPUnit\Framework\Error\Error::class : \Error::class); + $this->expectExceptionMessage('unable to send log entries via email;'); list($mail, $writer, $log) = $this->_getSimpleLogger(false); // Force the send() method to throw the same exception that would be @@ -277,8 +277,8 @@ public function testDestructorMailError() */ public function testDestructorLayoutError() { - $this->expectError(); - $this->expectErrorMessage('exception occurred when rendering layout; unable to set html body for message; message = bogus message'); + $this->expectException(version_compare(phpversion(), '7.1', '>') ? \PHPUnit\Framework\Error\Error::class : \Error::class); + $this->expectExceptionMessage('exception occurred when rendering layout; unable to set html body for message; message = bogus message'); list($mail, $writer, $log, $layout) = $this->_getSimpleLogger(true); @@ -518,6 +518,6 @@ protected function _getEvent() } // Call Zend_Log_Writer_MailTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Log_Writer_MailTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Log_Writer_MailTest::main") { Zend_Log_Writer_MailTest::main(); } diff --git a/tests/Zend/Log/Writer/MockTest.php b/tests/Zend/Log/Writer/MockTest.php index 2c11f90f32..6fa6b9ac9d 100644 --- a/tests/Zend/Log/Writer/MockTest.php +++ b/tests/Zend/Log/Writer/MockTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testWrite() @@ -70,6 +70,6 @@ public function testFactory() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_MockTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Writer_MockTest::main') { Zend_Log_Writer_MockTest::main(); } diff --git a/tests/Zend/Log/Writer/NullTest.php b/tests/Zend/Log/Writer/NullTest.php index 5538e5c643..d9369d7728 100644 --- a/tests/Zend/Log/Writer/NullTest.php +++ b/tests/Zend/Log/Writer/NullTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -69,6 +69,6 @@ public function testFactory() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_NullTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Writer_NullTest::main') { Zend_Log_Writer_NullTest::main(); } diff --git a/tests/Zend/Log/Writer/StreamTest.php b/tests/Zend/Log/Writer/StreamTest.php index 1239dae496..9bd250a6be 100644 --- a/tests/Zend/Log/Writer/StreamTest.php +++ b/tests/Zend/Log/Writer/StreamTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testConstructorThrowsWhenResourceIsNotStream() @@ -207,6 +207,6 @@ public function testFactoryUrl() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_StreamTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Writer_StreamTest::main') { Zend_Log_Writer_StreamTest::main(); } diff --git a/tests/Zend/Log/Writer/SyslogTest.php b/tests/Zend/Log/Writer/SyslogTest.php index 8e575eafc7..6967230d36 100755 --- a/tests/Zend/Log/Writer/SyslogTest.php +++ b/tests/Zend/Log/Writer/SyslogTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -149,6 +149,6 @@ public function getFacility() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_SyslogTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Writer_SyslogTest::main') { Zend_Log_Writer_SyslogTest::main(); } diff --git a/tests/Zend/Log/Writer/ZendMonitorTest.php b/tests/Zend/Log/Writer/ZendMonitorTest.php index d91b0562ab..0f40264207 100755 --- a/tests/Zend/Log/Writer/ZendMonitorTest.php +++ b/tests/Zend/Log/Writer/ZendMonitorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,6 +73,6 @@ public function testIsEnabled() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_ZendMonitorTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Log_Writer_ZendMonitorTest::main') { Zend_Log_Writer_ZendMonitorTest::main(); } diff --git a/tests/Zend/Mail/AllTests.php b/tests/Zend/Mail/AllTests.php index 10db4e7755..2efd5fecbb 100644 --- a/tests/Zend/Mail/AllTests.php +++ b/tests/Zend/Mail/AllTests.php @@ -58,7 +58,7 @@ class Zend_Mail_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -95,6 +95,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Mail_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Mail_AllTests::main') { Zend_Mail_AllTests::main(); } diff --git a/tests/Zend/Mail/FileTransportTest.php b/tests/Zend/Mail/FileTransportTest.php index 1a4780df41..220683adf1 100644 --- a/tests/Zend/Mail/FileTransportTest.php +++ b/tests/Zend/Mail/FileTransportTest.php @@ -1,6 +1,6 @@ createdTmpDir = false; @@ -74,7 +74,7 @@ protected function setUp(): void $this->_cleanDir($this->_tmpdir); } - protected function tearDown(): void + protected function tear_down() { $this->_cleanDir($this->_tmpdir); if ($this->createdTmpDir) { diff --git a/tests/Zend/Mail/Header/AllTests.php b/tests/Zend/Mail/Header/AllTests.php index 19621689f9..bcc29b76e7 100644 --- a/tests/Zend/Mail/Header/AllTests.php +++ b/tests/Zend/Mail/Header/AllTests.php @@ -43,7 +43,7 @@ class Zend_Mail_Header_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Mail_Header_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Mail_Header_AllTests::main') { Zend_Mail_Header_AllTests::main(); } diff --git a/tests/Zend/Mail/Header/HeaderNameTest.php b/tests/Zend/Mail/Header/HeaderNameTest.php index 46642f48be..80398e9e6b 100644 --- a/tests/Zend/Mail/Header/HeaderNameTest.php +++ b/tests/Zend/Mail/Header/HeaderNameTest.php @@ -1,6 +1,6 @@ _params = ['host' => TESTS_ZEND_MAIL_IMAP_HOST, 'user' => TESTS_ZEND_MAIL_IMAP_USER, diff --git a/tests/Zend/Mail/InterfaceTest.php b/tests/Zend/Mail/InterfaceTest.php index 8dc31e3ae2..44689bcaf9 100644 --- a/tests/Zend/Mail/InterfaceTest.php +++ b/tests/Zend/Mail/InterfaceTest.php @@ -1,6 +1,6 @@ _mboxFile = dirname(__FILE__) . '/_files/test.mbox/INBOX'; } diff --git a/tests/Zend/Mail/MailTest.php b/tests/Zend/Mail/MailTest.php index e152150d10..59a5c2eef2 100644 --- a/tests/Zend/Mail/MailTest.php +++ b/tests/Zend/Mail/MailTest.php @@ -1,6 +1,6 @@ _originalDir = dirname(__FILE__) . '/_files/test.maildir/'; @@ -109,7 +109,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { foreach (array_reverse($this->_subdirs) as $dir) { foreach (['cur', 'new'] as $subdir) { diff --git a/tests/Zend/Mail/MaildirMessageOldTest.php b/tests/Zend/Mail/MaildirMessageOldTest.php index a005eeb7b1..ed3617e094 100644 --- a/tests/Zend/Mail/MaildirMessageOldTest.php +++ b/tests/Zend/Mail/MaildirMessageOldTest.php @@ -1,6 +1,6 @@ _originalMaildir = dirname(__FILE__) . '/_files/test.maildir/'; if (!is_dir($this->_originalMaildir . '/cur/')) { @@ -115,7 +115,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { foreach (['cur', 'new'] as $dir) { $dh = opendir($this->_tmpdir . $dir); diff --git a/tests/Zend/Mail/MaildirTest.php b/tests/Zend/Mail/MaildirTest.php index 907ceab4b8..e2e3c6a229 100644 --- a/tests/Zend/Mail/MaildirTest.php +++ b/tests/Zend/Mail/MaildirTest.php @@ -1,6 +1,6 @@ _originalMaildir = dirname(__FILE__) . '/_files/test.maildir/'; if (!is_dir($this->_originalMaildir . '/cur/')) { @@ -97,7 +97,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { foreach (['cur', 'new'] as $dir) { $dh = opendir($this->_tmpdir . $dir); diff --git a/tests/Zend/Mail/MaildirWritableTest.php b/tests/Zend/Mail/MaildirWritableTest.php index 984c04f38a..e9ead3a4f9 100644 --- a/tests/Zend/Mail/MaildirWritableTest.php +++ b/tests/Zend/Mail/MaildirWritableTest.php @@ -1,6 +1,6 @@ _originalDir = dirname(__FILE__) . '/_files/test.maildir/'; @@ -101,7 +101,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { foreach (array_reverse($this->_subdirs) as $dir) { if (!file_exists($this->_tmpdir . $dir)) { @@ -675,7 +675,7 @@ public function testInitExisting() public function testInit() { - $this->tearDown(); + $this->tear_down(); // should fail now $e = null; @@ -695,7 +695,7 @@ public function testInit() public function testCreate() { - $this->tearDown(); + $this->tear_down(); // should fail now $e = null; diff --git a/tests/Zend/Mail/MboxFolderTest.php b/tests/Zend/Mail/MboxFolderTest.php index 7e15fbddb0..5255c710bc 100644 --- a/tests/Zend/Mail/MboxFolderTest.php +++ b/tests/Zend/Mail/MboxFolderTest.php @@ -1,6 +1,6 @@ _originalDir = dirname(__FILE__) . '/_files/test.mbox/'; @@ -94,7 +94,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { foreach (array_reverse($this->_subdirs) as $dir) { $dh = opendir($this->_tmpdir . $dir); diff --git a/tests/Zend/Mail/MboxMessageOldTest.php b/tests/Zend/Mail/MboxMessageOldTest.php index 1e80323f9a..2891677e3c 100644 --- a/tests/Zend/Mail/MboxMessageOldTest.php +++ b/tests/Zend/Mail/MboxMessageOldTest.php @@ -1,6 +1,6 @@ _tmpdir == null) { if (TESTS_ZEND_MAIL_TEMPDIR != null) { @@ -94,7 +94,7 @@ protected function setUp(): void copy($this->_mboxOriginalFile, $this->_mboxFile); } - protected function tearDown(): void + protected function tear_down() { unlink((string) $this->_mboxFile); } diff --git a/tests/Zend/Mail/MboxTest.php b/tests/Zend/Mail/MboxTest.php index 786ebd9ab1..951619a3e8 100644 --- a/tests/Zend/Mail/MboxTest.php +++ b/tests/Zend/Mail/MboxTest.php @@ -1,6 +1,6 @@ _tmpdir == null) { if (TESTS_ZEND_MAIL_TEMPDIR != null) { @@ -77,7 +77,7 @@ protected function setUp(): void copy($this->_mboxOriginalFile, $this->_mboxFile); } - protected function tearDown(): void + protected function tear_down() { unlink((string) $this->_mboxFile); } diff --git a/tests/Zend/Mail/MessageTest.php b/tests/Zend/Mail/MessageTest.php index 0152373f94..4f65b2b9b0 100644 --- a/tests/Zend/Mail/MessageTest.php +++ b/tests/Zend/Mail/MessageTest.php @@ -1,6 +1,6 @@ _file = tempnam(sys_get_temp_dir(), 'zm_'); $mail = file_get_contents(dirname(__FILE__) . '/_files/mail.txt'); @@ -58,7 +58,7 @@ protected function setUp(): void file_put_contents($this->_file, $mail); } - protected function tearDown(): void + protected function tear_down() { if (file_exists($this->_file)) { unlink($this->_file); diff --git a/tests/Zend/Mail/Pop3Test.php b/tests/Zend/Mail/Pop3Test.php index 07afc6c99f..d3ee834af2 100644 --- a/tests/Zend/Mail/Pop3Test.php +++ b/tests/Zend/Mail/Pop3Test.php @@ -1,6 +1,6 @@ _params = ['host' => TESTS_ZEND_MAIL_POP3_HOST, 'user' => TESTS_ZEND_MAIL_POP3_USER, diff --git a/tests/Zend/Mail/SmtpOfflineTest.php b/tests/Zend/Mail/SmtpOfflineTest.php index 4be0871a5f..d1d588a0ec 100644 --- a/tests/Zend/Mail/SmtpOfflineTest.php +++ b/tests/Zend/Mail/SmtpOfflineTest.php @@ -1,6 +1,6 @@ _params = ['host' => TESTS_ZEND_MAIL_SMTP_HOST, 'port' => TESTS_ZEND_MAIL_SMTP_PORT, diff --git a/tests/Zend/Mail/SmtpProtocolTest.php b/tests/Zend/Mail/SmtpProtocolTest.php index 3308d99a21..1b7bb2c3a7 100644 --- a/tests/Zend/Mail/SmtpProtocolTest.php +++ b/tests/Zend/Mail/SmtpProtocolTest.php @@ -1,6 +1,6 @@ _protocol = new ProtocolMock(); } diff --git a/tests/Zend/Mail/SmtpTest.php b/tests/Zend/Mail/SmtpTest.php index 6a724ef34d..6bb03bd517 100644 --- a/tests/Zend/Mail/SmtpTest.php +++ b/tests/Zend/Mail/SmtpTest.php @@ -1,6 +1,6 @@ _params = ['host' => TESTS_ZEND_MAIL_SMTP_HOST, 'port' => TESTS_ZEND_MAIL_SMTP_PORT, diff --git a/tests/Zend/Markup/AllTests.php b/tests/Zend/Markup/AllTests.php index ea9ee73645..7de47facfe 100644 --- a/tests/Zend/Markup/AllTests.php +++ b/tests/Zend/Markup/AllTests.php @@ -50,7 +50,7 @@ public static function main() $parameters['reportDirectory'] = TESTS_GENERATE_REPORT_TARGET; } - (new TestRunner())->run(self::suite(), $parameters); + (new resources_Runner())->run(self::suite(), $parameters); } public static function suite() @@ -65,6 +65,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Markup_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Markup_AllTests::main') { Zend_Markup_AllTests::main(); } diff --git a/tests/Zend/Markup/BbcodeAndHtmlTest.php b/tests/Zend/Markup/BbcodeAndHtmlTest.php index 8eb20874f3..f1d9df1635 100644 --- a/tests/Zend/Markup/BbcodeAndHtmlTest.php +++ b/tests/Zend/Markup/BbcodeAndHtmlTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -67,7 +67,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->_markup = Zend_Markup::factory('bbcode', 'html'); } @@ -78,7 +78,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->_markup); } @@ -605,6 +605,6 @@ public function testNoXssInH() // Call Zend_Markup_BbcodeAndHtmlTest::main() // if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Markup_BbcodeAndHtmlTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Markup_BbcodeAndHtmlTest::main") { Zend_Markup_BbcodeAndHtmlTest::main(); } diff --git a/tests/Zend/Markup/FactoryTest.php b/tests/Zend/Markup/FactoryTest.php index 55da4d277d..f6b2b67b2a 100644 --- a/tests/Zend/Markup/FactoryTest.php +++ b/tests/Zend/Markup/FactoryTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testBbcodeParser() @@ -85,6 +85,6 @@ public function testBbcodeParser() } // Call Zend_Markup_BbcodeTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Markup_ParserIntegrityTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Markup_ParserIntegrityTest::main") { Zend_Markup_BbcodeTest::main(); } diff --git a/tests/Zend/Measure/AccelerationTest.php b/tests/Zend/Measure/AccelerationTest.php index b83cf954cf..8127651057 100644 --- a/tests/Zend/Measure/AccelerationTest.php +++ b/tests/Zend/Measure/AccelerationTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -120,6 +120,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Measure_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Measure_AllTests::main') { Zend_Measure_AllTests::main(); } diff --git a/tests/Zend/Measure/AngleTest.php b/tests/Zend/Measure/AngleTest.php index 34e5975036..447c0e58f7 100644 --- a/tests/Zend/Measure/AngleTest.php +++ b/tests/Zend/Measure/AngleTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (Zend_Registry::isRegistered('Zend_Locale')) { $registry = Zend_Registry::getInstance(); @@ -72,7 +72,7 @@ protected function setUp(): void setlocale(LC_ALL, 'de'); } - protected function tearDown(): void + protected function tear_down() { if (is_string($this->_locale) && strpos($this->_locale, ';')) { $locales = []; @@ -459,6 +459,6 @@ public function testDetailConversion() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Measure_TemperatureTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Measure_TemperatureTest::main') { Zend_Measure_TemperatureTest::main(); } diff --git a/tests/Zend/Measure/TimeTest.php b/tests/Zend/Measure/TimeTest.php index 89b249f31d..2c6f716020 100644 --- a/tests/Zend/Measure/TimeTest.php +++ b/tests/Zend/Measure/TimeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $tmpDir = sys_get_temp_dir() . '/zend_memory'; $this->_removeCacheDir($tmpDir); @@ -166,6 +166,6 @@ public function testLock() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Memory_AccessControllerTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Memory_AccessControllerTest::main') { Zend_Memory_AccessControllerTest::main(); } diff --git a/tests/Zend/Memory/AllTests.php b/tests/Zend/Memory/AllTests.php index fb0df55ee3..bfb903de0e 100644 --- a/tests/Zend/Memory/AllTests.php +++ b/tests/Zend/Memory/AllTests.php @@ -47,7 +47,7 @@ class Zend_Memory_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -65,6 +65,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Memory_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Memory_AllTests::main') { Zend_Memory_AllTests::main(); } diff --git a/tests/Zend/Memory/LockedTest.php b/tests/Zend/Memory/LockedTest.php index 031e6f7af9..de73e3d422 100644 --- a/tests/Zend/Memory/LockedTest.php +++ b/tests/Zend/Memory/LockedTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $tmpDir = sys_get_temp_dir() . '/zend_memory'; $this->_removeCacheDir($tmpDir); @@ -200,6 +200,6 @@ public function testProcessing() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Memory_MemoryManagerTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Memory_MemoryManagerTest::main') { Zend_Memory_MemoryManagerTest::main(); } diff --git a/tests/Zend/Memory/MemoryTest.php b/tests/Zend/Memory/MemoryTest.php index 917c30bd50..7a26e29300 100644 --- a/tests/Zend/Memory/MemoryTest.php +++ b/tests/Zend/Memory/MemoryTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $tmpDir = sys_get_temp_dir() . '/zend_memory'; $this->_removeCacheDir($tmpDir); @@ -133,6 +133,6 @@ public function providerCacheBackend() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Memory_MemoryTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Memory_MemoryTest::main') { Zend_Memory_MemoryTest::main(); } diff --git a/tests/Zend/Memory/MovableTest.php b/tests/Zend/Memory/MovableTest.php index 1f44083dbe..3a02e29a70 100644 --- a/tests/Zend/Memory/MovableTest.php +++ b/tests/Zend/Memory/MovableTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Mime_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Mime_AllTests::main') { Zend_Mime_AllTests::main(); } diff --git a/tests/Zend/Mime/MessageTest.php b/tests/Zend/Mime/MessageTest.php index ff66e87144..cbb311df95 100644 --- a/tests/Zend/Mime/MessageTest.php +++ b/tests/Zend/Mime/MessageTest.php @@ -1,6 +1,6 @@ testText = 'safdsafsa�lg ��gd�� sd�jg�sdjg�ld�gksd�gj�sdfg�dsj�gjsd�gj�dfsjg�dsfj�djs�g kjhdkj ' . 'fgaskjfdh gksjhgjkdh gjhfsdghdhgksdjhg'; diff --git a/tests/Zend/MimeTest.php b/tests/Zend/MimeTest.php index 043b177a0b..d495e8b0db 100644 --- a/tests/Zend/MimeTest.php +++ b/tests/Zend/MimeTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -56,6 +56,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Mobile_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Mobile_AllTests::main') { Zend_Mobile_AllTests::main(); } diff --git a/tests/Zend/Mobile/Push/AbstractTest.php b/tests/Zend/Mobile/Push/AbstractTest.php index 12777230d4..93f4d3d285 100644 --- a/tests/Zend/Mobile/Push/AbstractTest.php +++ b/tests/Zend/Mobile/Push/AbstractTest.php @@ -1,6 +1,6 @@ adapter = new Zend_Mobile_Push_AbstractProxy(); } diff --git a/tests/Zend/Mobile/Push/AllTests.php b/tests/Zend/Mobile/Push/AllTests.php index 2b99df275d..c55415fa2c 100644 --- a/tests/Zend/Mobile/Push/AllTests.php +++ b/tests/Zend/Mobile/Push/AllTests.php @@ -47,7 +47,7 @@ class Zend_Mobile_Push_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -65,6 +65,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Mobile_Push_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Mobile_Push_AllTests::main') { Zend_Mobile_Push_AllTests::main(); } diff --git a/tests/Zend/Mobile/Push/ApnsTest.php b/tests/Zend/Mobile/Push/ApnsTest.php index 2027b69334..b7df16b805 100644 --- a/tests/Zend/Mobile/Push/ApnsTest.php +++ b/tests/Zend/Mobile/Push/ApnsTest.php @@ -1,6 +1,6 @@ apns = new Zend_Mobile_Push_Test_ApnsProxy(); $this->message = new Zend_Mobile_Push_Message_Apns(); diff --git a/tests/Zend/Mobile/Push/GcmTest.php b/tests/Zend/Mobile/Push/GcmTest.php index 05e3af210d..f09d537f5b 100644 --- a/tests/Zend/Mobile/Push/GcmTest.php +++ b/tests/Zend/Mobile/Push/GcmTest.php @@ -1,6 +1,6 @@ adapter = new Zend_Http_Client_Adapter_Test(); $this->client = new Zend_Http_Client(); diff --git a/tests/Zend/Mobile/Push/Message/AbstractTest.php b/tests/Zend/Mobile/Push/Message/AbstractTest.php index d0b85f9ae9..2ac2e82f4a 100644 --- a/tests/Zend/Mobile/Push/Message/AbstractTest.php +++ b/tests/Zend/Mobile/Push/Message/AbstractTest.php @@ -1,6 +1,6 @@ msg = new Zend_Mobile_Push_Message_AbstractProxy(); } diff --git a/tests/Zend/Mobile/Push/Message/AllTests.php b/tests/Zend/Mobile/Push/Message/AllTests.php index 278583ca55..2ecca6576f 100644 --- a/tests/Zend/Mobile/Push/Message/AllTests.php +++ b/tests/Zend/Mobile/Push/Message/AllTests.php @@ -45,7 +45,7 @@ class Zend_Mobile_Push_Message_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -62,6 +62,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Mobile_Push_Message_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Mobile_Push_Message_AllTests::main') { Zend_Mobile_Push_Message_AllTests::main(); } diff --git a/tests/Zend/Mobile/Push/Message/ApnsTest.php b/tests/Zend/Mobile/Push/Message/ApnsTest.php index 1e1ce23323..d83c20d0bb 100644 --- a/tests/Zend/Mobile/Push/Message/ApnsTest.php +++ b/tests/Zend/Mobile/Push/Message/ApnsTest.php @@ -1,6 +1,6 @@ message = new Zend_Mobile_Push_Message_Apns(); } diff --git a/tests/Zend/Mobile/Push/Message/GcmTest.php b/tests/Zend/Mobile/Push/Message/GcmTest.php index 8c60a5b85c..e7b98127ae 100644 --- a/tests/Zend/Mobile/Push/Message/GcmTest.php +++ b/tests/Zend/Mobile/Push/Message/GcmTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Mobile_Push_Message_Mpns_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Mobile_Push_Message_Mpns_AllTests::main') { Zend_Mobile_Push_Message_Mpns_AllTests::main(); } diff --git a/tests/Zend/Mobile/Push/Message/Mpns/RawTest.php b/tests/Zend/Mobile/Push/Message/Mpns/RawTest.php index 6d397244ed..8d0f8c043c 100644 --- a/tests/Zend/Mobile/Push/Message/Mpns/RawTest.php +++ b/tests/Zend/Mobile/Push/Message/Mpns/RawTest.php @@ -1,6 +1,6 @@ _msg = new Zend_Mobile_Push_Message_Mpns_Raw(); } diff --git a/tests/Zend/Mobile/Push/Message/Mpns/TileTest.php b/tests/Zend/Mobile/Push/Message/Mpns/TileTest.php index cb8bae95c2..63f11436c3 100644 --- a/tests/Zend/Mobile/Push/Message/Mpns/TileTest.php +++ b/tests/Zend/Mobile/Push/Message/Mpns/TileTest.php @@ -1,6 +1,6 @@ _msg = new Zend_Mobile_Push_Message_Mpns_Tile(); } diff --git a/tests/Zend/Mobile/Push/Message/Mpns/ToastTest.php b/tests/Zend/Mobile/Push/Message/Mpns/ToastTest.php index 28ffa7c51a..964e13c7b5 100644 --- a/tests/Zend/Mobile/Push/Message/Mpns/ToastTest.php +++ b/tests/Zend/Mobile/Push/Message/Mpns/ToastTest.php @@ -1,6 +1,6 @@ _msg = new Zend_Mobile_Push_Message_Mpns_Toast(); } diff --git a/tests/Zend/Mobile/Push/MpnsTest.php b/tests/Zend/Mobile/Push/MpnsTest.php index 1d384af6d4..ba06ec3db1 100644 --- a/tests/Zend/Mobile/Push/MpnsTest.php +++ b/tests/Zend/Mobile/Push/MpnsTest.php @@ -1,6 +1,6 @@ adapter = new Zend_Http_Client_Adapter_Test(); $this->client = new Zend_Http_Client(); diff --git a/tests/Zend/Mobile/Push/Response/AllTests.php b/tests/Zend/Mobile/Push/Response/AllTests.php index c8736790a0..5c18ba8986 100644 --- a/tests/Zend/Mobile/Push/Response/AllTests.php +++ b/tests/Zend/Mobile/Push/Response/AllTests.php @@ -42,7 +42,7 @@ class Zend_Mobile_Push_Response_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Mobile_Push_Response_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Mobile_Push_Response_AllTests::main') { Zend_Mobile_Push_Response_AllTests::main(); } diff --git a/tests/Zend/Mobile/Push/Response/GcmTest.php b/tests/Zend/Mobile/Push/Response/GcmTest.php index 67652f11d0..984a13f9c0 100644 --- a/tests/Zend/Mobile/Push/Response/GcmTest.php +++ b/tests/Zend/Mobile/Push/Response/GcmTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -61,6 +61,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Navigation_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Navigation_AllTests::main') { Zend_Navigation_AllTests::main(); } diff --git a/tests/Zend/Navigation/ContainerTest.php b/tests/Zend/Navigation/ContainerTest.php index 67da4e6a4c..e64a99b274 100644 --- a/tests/Zend/Navigation/ContainerTest.php +++ b/tests/Zend/Navigation/ContainerTest.php @@ -1,6 +1,6 @@ setRequest( new Zend_Controller_Request_Http() @@ -55,7 +55,7 @@ protected function setUp(): void * Tear down the environment after running a test * */ - protected function tearDown(): void + protected function tear_down() { } diff --git a/tests/Zend/Navigation/Page/AllTests.php b/tests/Zend/Navigation/Page/AllTests.php index 4d33940f82..38645fbade 100644 --- a/tests/Zend/Navigation/Page/AllTests.php +++ b/tests/Zend/Navigation/Page/AllTests.php @@ -43,7 +43,7 @@ class Zend_Navigation_Page_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Navigation_Page_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Navigation_Page_AllTests::main') { Zend_Navigation_Page_AllTests::main(); } diff --git a/tests/Zend/Navigation/Page/MvcTest.php b/tests/Zend/Navigation/Page/MvcTest.php index 2069b80dcb..f8151a29aa 100644 --- a/tests/Zend/Navigation/Page/MvcTest.php +++ b/tests/Zend/Navigation/Page/MvcTest.php @@ -1,6 +1,6 @@ _front = Zend_Controller_Front::getInstance(); $this->_oldRequest = $this->_front->getRequest(); @@ -70,7 +70,7 @@ protected function setUp(): void $this->_front->getRouter()->addDefaultRoutes(); } - protected function tearDown(): void + protected function tear_down() { unset($_SERVER['HTTP_HOST']); if (null !== $this->_oldRequest) { diff --git a/tests/Zend/Navigation/Page/UriTest.php b/tests/Zend/Navigation/Page/UriTest.php index 9335e4e5af..79293bb64d 100644 --- a/tests/Zend/Navigation/Page/UriTest.php +++ b/tests/Zend/Navigation/Page/UriTest.php @@ -1,6 +1,6 @@ _oldIncludePath = get_include_path(); @@ -50,7 +50,7 @@ protected function setUp(): void set_include_path($addToPath . PATH_SEPARATOR . $this->_oldIncludePath); } - protected function tearDown(): void + protected function tear_down() { // reset include path set_include_path($this->_oldIncludePath); diff --git a/tests/Zend/Navigation/PageTest.php b/tests/Zend/Navigation/PageTest.php index 60afc6fdaa..8d2a9c06be 100644 --- a/tests/Zend/Navigation/PageTest.php +++ b/tests/Zend/Navigation/PageTest.php @@ -1,6 +1,6 @@ _navigation = new Zend_Navigation(); } - protected function tearDown(): void + protected function tear_down() { $this->_navigation = null; - parent::tearDown(); + parent::tear_down(); } /** * Runs the test methods of this class. @@ -68,7 +68,7 @@ protected function tearDown(): void public static function main() { $suite = new TestSuite("Zend_NavigationTest"); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } /** diff --git a/tests/Zend/Oauth/AllTests.php b/tests/Zend/Oauth/AllTests.php index 478408b7f5..10f624a03b 100644 --- a/tests/Zend/Oauth/AllTests.php +++ b/tests/Zend/Oauth/AllTests.php @@ -56,7 +56,7 @@ class Zend_Oauth_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -83,6 +83,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Oauth_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Oauth_AllTests::main') { Zend_Oauth_AllTests::main(); } diff --git a/tests/Zend/Oauth/ClientTest.php b/tests/Zend/Oauth/ClientTest.php index 97b4c751b6..eb9259efde 100644 --- a/tests/Zend/Oauth/ClientTest.php +++ b/tests/Zend/Oauth/ClientTest.php @@ -1,6 +1,6 @@ client = new Zend_Oauth_Client([]); } diff --git a/tests/Zend/Oauth/ConfigTest.php b/tests/Zend/Oauth/ConfigTest.php index 2eec8a3b8f..8e1d6c9df7 100644 --- a/tests/Zend/Oauth/ConfigTest.php +++ b/tests/Zend/Oauth/ConfigTest.php @@ -1,6 +1,6 @@ config = new Zend_Oauth_Config(); } diff --git a/tests/Zend/Oauth/Oauth/ConsumerTest.php b/tests/Zend/Oauth/Oauth/ConsumerTest.php index dffba91a42..8270d24042 100644 --- a/tests/Zend/Oauth/Oauth/ConsumerTest.php +++ b/tests/Zend/Oauth/Oauth/ConsumerTest.php @@ -1,6 +1,6 @@ stubConsumer = new Test_Consumer_39745(); $this->stubHttpUtility = new Test_Http_Utility_39745(); Zend_Oauth::setHttpClient(new Test_Client_39745()); } - protected function tearDown(): void + protected function tear_down() { Zend_Oauth::clearHttpClient(); } diff --git a/tests/Zend/Oauth/Oauth/Http/RequestTokenTest.php b/tests/Zend/Oauth/Oauth/Http/RequestTokenTest.php index 1917a43334..7539ae9de5 100644 --- a/tests/Zend/Oauth/Oauth/Http/RequestTokenTest.php +++ b/tests/Zend/Oauth/Oauth/Http/RequestTokenTest.php @@ -1,6 +1,6 @@ stubConsumer = new Test_Consumer_32874(); $this->stubConsumer2 = new Test_Consumer_32874b(); @@ -56,7 +56,7 @@ protected function setUp(): void Zend_Oauth::setHttpClient(new Test_Client_32874()); } - protected function tearDown(): void + protected function tear_down() { Zend_Oauth::clearHttpClient(); } diff --git a/tests/Zend/Oauth/Oauth/Http/UserAuthorizationTest.php b/tests/Zend/Oauth/Oauth/Http/UserAuthorizationTest.php index e2135c1893..5da15908c4 100644 --- a/tests/Zend/Oauth/Oauth/Http/UserAuthorizationTest.php +++ b/tests/Zend/Oauth/Oauth/Http/UserAuthorizationTest.php @@ -1,6 +1,6 @@ stubConsumer = new Test_Consumer_34879(); } diff --git a/tests/Zend/Oauth/Oauth/Http/UtilityTest.php b/tests/Zend/Oauth/Oauth/Http/UtilityTest.php index 7e2af65fcf..1513b462e2 100644 --- a/tests/Zend/Oauth/Oauth/Http/UtilityTest.php +++ b/tests/Zend/Oauth/Oauth/Http/UtilityTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -67,6 +67,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_OpenId_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_OpenId_AllTests::main') { Zend_OpenId_AllTests::main(); } diff --git a/tests/Zend/OpenId/Consumer/Storage/FileTest.php b/tests/Zend/OpenId/Consumer/Storage/FileTest.php index d97c62f4df..c13bad3649 100644 --- a/tests/Zend/OpenId/Consumer/Storage/FileTest.php +++ b/tests/Zend/OpenId/Consumer/Storage/FileTest.php @@ -1,6 +1,6 @@ _tmpDir = dirname(__FILE__) . "/_files"; @@ -89,7 +89,7 @@ protected function setUp(): void mkdir($this->_tmpDir); } - protected function tearDown(): void + protected function tear_down() { self::_rmDir($this->_tmpDir); } diff --git a/tests/Zend/OpenId/ConsumerTest.php b/tests/Zend/OpenId/ConsumerTest.php index 7b6b39145c..b4f2497d28 100644 --- a/tests/Zend/OpenId/ConsumerTest.php +++ b/tests/Zend/OpenId/ConsumerTest.php @@ -1,6 +1,6 @@ _user1 = new Zend_OpenId_Provider_User_Session(); $this->_user2 = new Zend_OpenId_Provider_User_Session(new Zend_Session_Namespace("openid2")); diff --git a/tests/Zend/OpenId/ProviderTest.php b/tests/Zend/OpenId/ProviderTest.php index 89ac39837b..f0b936aa8a 100644 --- a/tests/Zend/OpenId/ProviderTest.php +++ b/tests/Zend/OpenId/ProviderTest.php @@ -1,6 +1,6 @@ _serverVariables = $_SERVER; } - protected function tearDown(): void + protected function tear_down() { $_SERVER = $this->_serverVariables; } diff --git a/tests/Zend/Paginator/Adapter/ArrayTest.php b/tests/Zend/Paginator/Adapter/ArrayTest.php index 6b45711412..6b6458570b 100644 --- a/tests/Zend/Paginator/Adapter/ArrayTest.php +++ b/tests/Zend/Paginator/Adapter/ArrayTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Paginator_Adapter_Array(range(1, 101)); } /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; - parent::tearDown(); + parent::tear_down(); } public function testGetsItemsAtOffsetZero() diff --git a/tests/Zend/Paginator/Adapter/DbSelect/OracleTest.php b/tests/Zend/Paginator/Adapter/DbSelect/OracleTest.php index 07d84aadf9..244c7d7df4 100644 --- a/tests/Zend/Paginator/Adapter/DbSelect/OracleTest.php +++ b/tests/Zend/Paginator/Adapter/DbSelect/OracleTest.php @@ -50,7 +50,7 @@ class Zend_Paginator_Adapter_DbSelect_OracleTest extends Zend_Paginator_Adapter_ /** * Prepares the environment before running a test. */ - protected function setUp(): void + protected function set_up() { if (!extension_loaded('oci8')) { $this->markTestSkipped('Oci8 extension is not loaded'); @@ -84,7 +84,7 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { if (!extension_loaded('oci8')) { $this->markTestSkipped('Oci8 extension is not loaded'); diff --git a/tests/Zend/Paginator/Adapter/DbSelectTest.php b/tests/Zend/Paginator/Adapter/DbSelectTest.php index dba05f2ddb..9132116241 100644 --- a/tests/Zend/Paginator/Adapter/DbSelectTest.php +++ b/tests/Zend/Paginator/Adapter/DbSelectTest.php @@ -1,6 +1,6 @@ markTestSkipped('Pdo_Sqlite extension is not loaded'); } - parent::setUp(); + parent::set_up(); $this->_db = new Zend_Db_Adapter_Pdo_Sqlite([ 'dbname' => dirname(__FILE__) . '/../_files/test.sqlite' @@ -97,10 +97,10 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/Zend/Paginator/Adapter/IteratorTest.php b/tests/Zend/Paginator/Adapter/IteratorTest.php index 0e53a530e0..2abef8312e 100644 --- a/tests/Zend/Paginator/Adapter/IteratorTest.php +++ b/tests/Zend/Paginator/Adapter/IteratorTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Paginator_Adapter_Iterator($iterator); } /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; - parent::tearDown(); + parent::tear_down(); } public function testGetsItemsAtOffsetZero() diff --git a/tests/Zend/Paginator/Adapter/NullTest.php b/tests/Zend/Paginator/Adapter/NullTest.php index ba90568f97..c02deb4dd2 100644 --- a/tests/Zend/Paginator/Adapter/NullTest.php +++ b/tests/Zend/Paginator/Adapter/NullTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Paginator_Adapter_Null(101); } /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; - parent::tearDown(); + parent::tear_down(); } public function testGetsItems() diff --git a/tests/Zend/Paginator/AllTests.php b/tests/Zend/Paginator/AllTests.php index d9130eb995..6242eca2a1 100644 --- a/tests/Zend/Paginator/AllTests.php +++ b/tests/Zend/Paginator/AllTests.php @@ -57,7 +57,7 @@ class Zend_Paginator_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -87,6 +87,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Paginator_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Paginator_AllTests::main') { Zend_Paginator_AllTests::main(); } diff --git a/tests/Zend/Paginator/ScrollingStyle/AllTest.php b/tests/Zend/Paginator/ScrollingStyle/AllTest.php index 4ea9795cfa..1c7bd8c815 100644 --- a/tests/Zend/Paginator/ScrollingStyle/AllTest.php +++ b/tests/Zend/Paginator/ScrollingStyle/AllTest.php @@ -1,6 +1,6 @@ _scrollingStyle = new Zend_Paginator_ScrollingStyle_All(); $this->_paginator = Zend_Paginator::factory(range(1, 101)); $this->_paginator->setItemCountPerPage(10); @@ -66,11 +66,11 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $this->_scrollingStyle = null; $this->_paginator = null; - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/Zend/Paginator/ScrollingStyle/ElasticTest.php b/tests/Zend/Paginator/ScrollingStyle/ElasticTest.php index db91a6c6b0..5180d29647 100644 --- a/tests/Zend/Paginator/ScrollingStyle/ElasticTest.php +++ b/tests/Zend/Paginator/ScrollingStyle/ElasticTest.php @@ -1,6 +1,6 @@ _scrollingStyle = new Zend_Paginator_ScrollingStyle_Elastic(); $this->_paginator = Zend_Paginator::factory(range(1, 101)); $this->_paginator->setItemCountPerPage(5); @@ -70,11 +70,11 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $this->_scrollingStyle = null; $this->_paginator = null; - parent::tearDown(); + parent::tear_down(); } public function testGetsPagesInRangeForFirstPage() diff --git a/tests/Zend/Paginator/ScrollingStyle/JumpingTest.php b/tests/Zend/Paginator/ScrollingStyle/JumpingTest.php index 374b815635..29800fd92b 100644 --- a/tests/Zend/Paginator/ScrollingStyle/JumpingTest.php +++ b/tests/Zend/Paginator/ScrollingStyle/JumpingTest.php @@ -1,6 +1,6 @@ _scrollingStyle = new Zend_Paginator_ScrollingStyle_Jumping(); $this->_paginator = Zend_Paginator::factory(range(1, 101)); $this->_paginator->setItemCountPerPage(10); @@ -73,11 +73,11 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $this->_scrollingStyle = null; $this->_paginator = null; - parent::tearDown(); + parent::tear_down(); } public function testGetsPagesInRangeForFirstPage() diff --git a/tests/Zend/Paginator/ScrollingStyle/SlidingTest.php b/tests/Zend/Paginator/ScrollingStyle/SlidingTest.php index 72f411a3ea..38edc564bc 100644 --- a/tests/Zend/Paginator/ScrollingStyle/SlidingTest.php +++ b/tests/Zend/Paginator/ScrollingStyle/SlidingTest.php @@ -1,6 +1,6 @@ _scrollingStyle = new Zend_Paginator_ScrollingStyle_Sliding(); $this->_paginator = Zend_Paginator::factory(range(1, 101)); $this->_paginator->setItemCountPerPage(10); @@ -70,11 +70,11 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $this->_scrollingStyle = null; $this->_paginator = null; - parent::tearDown(); + parent::tear_down(); } public function testGetsPagesInRangeForFirstPage() diff --git a/tests/Zend/PaginatorTest.php b/tests/Zend/PaginatorTest.php index 554dce1313..f92efaddc8 100644 --- a/tests/Zend/PaginatorTest.php +++ b/tests/Zend/PaginatorTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } protected $_dbConn; @@ -146,7 +146,7 @@ public static function main() protected $_adapter = null; - protected function setUp(): void + protected function set_up() { if (!extension_loaded('pdo_sqlite')) { $this->markTestSkipped('Pdo_Sqlite extension is not loaded'); @@ -175,7 +175,7 @@ protected function setUp(): void $this->_restorePaginatorDefaults(); } - protected function tearDown(): void + protected function tear_down() { $this->_dbConn = null; $this->_testCollection = null; diff --git a/tests/Zend/Pdf/ActionTest.php b/tests/Zend/Pdf/ActionTest.php index c926728207..05daca1ed0 100644 --- a/tests/Zend/Pdf/ActionTest.php +++ b/tests/Zend/Pdf/ActionTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -71,6 +71,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Pdf_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Pdf_AllTests::main') { Zend_Pdf_AllTests::main(); } diff --git a/tests/Zend/Pdf/DestinationTest.php b/tests/Zend/Pdf/DestinationTest.php index d736716bf8..7d846bcbaa 100644 --- a/tests/Zend/Pdf/DestinationTest.php +++ b/tests/Zend/Pdf/DestinationTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -75,6 +75,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Pdf_Element_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Pdf_Element_AllTests::main') { Zend_Pdf_Element_AllTests::main(); } diff --git a/tests/Zend/Pdf/Element/ArrayTest.php b/tests/Zend/Pdf/Element/ArrayTest.php index d28ccf92e3..3b60ffbffd 100644 --- a/tests/Zend/Pdf/Element/ArrayTest.php +++ b/tests/Zend/Pdf/Element/ArrayTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Pdf_Element_Object_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Pdf_Element_Object_AllTests::main') { Zend_Pdf_Element_Object_AllTests::main(); } diff --git a/tests/Zend/Pdf/Element/Object/StreamTest.php b/tests/Zend/Pdf/Element/Object/StreamTest.php index 4010416ab7..0fc65ce589 100644 --- a/tests/Zend/Pdf/Element/Object/StreamTest.php +++ b/tests/Zend/Pdf/Element/Object/StreamTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Pdf_Element_String_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Pdf_Element_String_AllTests::main') { Zend_Pdf_Element_String_AllTests::main(); } diff --git a/tests/Zend/Pdf/Element/String/BinaryTest.php b/tests/Zend/Pdf/Element/String/BinaryTest.php index fa87ded44e..bf2558e00d 100644 --- a/tests/Zend/Pdf/Element/String/BinaryTest.php +++ b/tests/Zend/Pdf/Element/String/BinaryTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Pdf_Filter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Pdf_Filter_AllTests::main') { Zend_Pdf_Filter_AllTests::main(); } diff --git a/tests/Zend/Pdf/Filter/Ascii85Test.php b/tests/Zend/Pdf/Filter/Ascii85Test.php index b8086ed03a..fe07717163 100644 --- a/tests/Zend/Pdf/Filter/Ascii85Test.php +++ b/tests/Zend/Pdf/Filter/Ascii85Test.php @@ -1,6 +1,6 @@ _pdf = Zend_Pdf::load(dirname(__FILE__) . '/Pdf/_files/PdfWithFields.pdf'); } diff --git a/tests/Zend/ProgressBar/Adapter/AllTests.php b/tests/Zend/ProgressBar/Adapter/AllTests.php index a4bb2a9d99..e6c6ad4841 100644 --- a/tests/Zend/ProgressBar/Adapter/AllTests.php +++ b/tests/Zend/ProgressBar/Adapter/AllTests.php @@ -44,7 +44,7 @@ class Zend_ProgressBar_Adapter_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -58,6 +58,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_ProgressBar_Adapter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_ProgressBar_Adapter_AllTests::main') { Zend_ProgressBar_Adapter_AllTests::main(); } diff --git a/tests/Zend/ProgressBar/Adapter/ConsoleTest.php b/tests/Zend/ProgressBar/Adapter/ConsoleTest.php index 71f769a1cf..7ba7e8a460 100644 --- a/tests/Zend/ProgressBar/Adapter/ConsoleTest.php +++ b/tests/Zend/ProgressBar/Adapter/ConsoleTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testWindowsWidth() @@ -367,6 +367,6 @@ protected function _outputData($data) } // Call Zend_ProgressBar_Adapter_ConsoleTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_ProgressBar_Adapert_ConsoleTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_ProgressBar_Adapert_ConsoleTest::main") { Zend_ProgressBar_Adapter_ConsoleTest::main(); } diff --git a/tests/Zend/ProgressBar/Adapter/JsPullTest.php b/tests/Zend/ProgressBar/Adapter/JsPullTest.php index 35ba37a816..1a7348cee3 100644 --- a/tests/Zend/ProgressBar/Adapter/JsPullTest.php +++ b/tests/Zend/ProgressBar/Adapter/JsPullTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testJson() @@ -97,6 +97,6 @@ protected function _outputData($data) } // Call Zend_ProgressBar_Adapter_JsPullTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_ProgressBar_Adapter_JsPullTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_ProgressBar_Adapter_JsPullTest::main") { Zend_ProgressBar_Adapter_JsPullTest::main(); } diff --git a/tests/Zend/ProgressBar/Adapter/JsPushTest.php b/tests/Zend/ProgressBar/Adapter/JsPushTest.php index 4cb95488ff..0a816916ee 100644 --- a/tests/Zend/ProgressBar/Adapter/JsPushTest.php +++ b/tests/Zend/ProgressBar/Adapter/JsPushTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testJson() @@ -100,6 +100,6 @@ protected function _outputData($data) } // Call Zend_ProgressBar_Adapter_jsPushTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_ProgressBar_Adapter_jsPushTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_ProgressBar_Adapter_jsPushTest::main") { Zend_ProgressBar_Adapter_jsPushTest::main(); } diff --git a/tests/Zend/ProgressBar/AllTests.php b/tests/Zend/ProgressBar/AllTests.php index 79c9982ea7..bc978b4e5f 100644 --- a/tests/Zend/ProgressBar/AllTests.php +++ b/tests/Zend/ProgressBar/AllTests.php @@ -43,7 +43,7 @@ class Zend_ProgressBar_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -56,6 +56,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_ProgressBar_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_ProgressBar_AllTests::main') { Zend_ProgressBar_AllTests::main(); } diff --git a/tests/Zend/ProgressBar/ProgressBarTest.php b/tests/Zend/ProgressBar/ProgressBarTest.php index 42402bd674..554591eb7d 100644 --- a/tests/Zend/ProgressBar/ProgressBarTest.php +++ b/tests/Zend/ProgressBar/ProgressBarTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testGreaterMin() @@ -234,6 +234,6 @@ public function getText() } // Call Zend_ProgressBar_ProgressBarTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_ProgressBar_ProgressBarTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_ProgressBar_ProgressBarTest::main") { Zend_ProgressBar_ProgressBarTest::main(); } diff --git a/tests/Zend/Queue/Adapter/ActivemqOfflineTest.php b/tests/Zend/Queue/Adapter/ActivemqOfflineTest.php index 6c5426e0b7..774c363aa7 100644 --- a/tests/Zend/Queue/Adapter/ActivemqOfflineTest.php +++ b/tests/Zend/Queue/Adapter/ActivemqOfflineTest.php @@ -1,6 +1,6 @@ markTestSkipped('TESTS_ZEND_QUEUE_ACTIVEMQ_ENABLED is not enabled in TestConfiguration.php'); } - parent::setUp(); + parent::set_up(); } diff --git a/tests/Zend/Queue/Adapter/AdapterTest.php b/tests/Zend/Queue/Adapter/AdapterTest.php index b21534bd2b..9231065622 100644 --- a/tests/Zend/Queue/Adapter/AdapterTest.php +++ b/tests/Zend/Queue/Adapter/AdapterTest.php @@ -1,6 +1,6 @@ error = false; } diff --git a/tests/Zend/Queue/Adapter/DbTest.php b/tests/Zend/Queue/Adapter/DbTest.php index f825d8fc10..7f856e4e98 100644 --- a/tests/Zend/Queue/Adapter/DbTest.php +++ b/tests/Zend/Queue/Adapter/DbTest.php @@ -58,13 +58,13 @@ class Zend_Queue_Adapter_DbTest extends Zend_Queue_Adapter_AdapterTest /** * Test setup */ - protected function setUp(): void + protected function set_up() { if (!TESTS_ZEND_QUEUE_DB) { $this->markTestSkipped('TESTS_ZEND_QUEUE_DB is not enabled in TestConfiguration.php'); } date_default_timezone_set('GMT'); - parent::setUp(); + parent::set_up(); } /** diff --git a/tests/Zend/Queue/Adapter/MemcacheqTest.php b/tests/Zend/Queue/Adapter/MemcacheqTest.php index f43f440533..8044c91241 100644 --- a/tests/Zend/Queue/Adapter/MemcacheqTest.php +++ b/tests/Zend/Queue/Adapter/MemcacheqTest.php @@ -53,7 +53,7 @@ class Zend_Queue_Adapter_MemcacheqTest extends Zend_Queue_Adapter_AdapterTest /** * Test setup */ - protected function setUp(): void + protected function set_up() { if (!TESTS_ZEND_QUEUE_MEMCACHEQ_ENABLED) { $this->markTestSkipped('TESTS_ZEND_QUEUE_MEMCACHEQ_ENABLED is not enabled in TestConfiguration.php'); @@ -62,7 +62,7 @@ protected function setUp(): void $this->markTestSkipped('memcache extension not loaded'); } date_default_timezone_set('GMT'); - parent::setUp(); + parent::set_up(); } /** diff --git a/tests/Zend/Queue/Adapter/PlatformJobQueueTest.php b/tests/Zend/Queue/Adapter/PlatformJobQueueTest.php index f8c4c5e47c..aa5f35aae1 100644 --- a/tests/Zend/Queue/Adapter/PlatformJobQueueTest.php +++ b/tests/Zend/Queue/Adapter/PlatformJobQueueTest.php @@ -42,7 +42,7 @@ */ class Zend_Queue_Adapter_PlatformJobQueueTest extends Zend_Queue_Adapter_AdapterTest { - protected function setUp(): void + protected function set_up() { if (!defined('TESTS_ZEND_QUEUE_PLATFORMJQ_HOST') || !constant('TESTS_ZEND_QUEUE_PLATFORMJQ_HOST') diff --git a/tests/Zend/Queue/AllTests.php b/tests/Zend/Queue/AllTests.php index 821e4d98a8..e7761b34f7 100644 --- a/tests/Zend/Queue/AllTests.php +++ b/tests/Zend/Queue/AllTests.php @@ -66,7 +66,7 @@ class Zend_Queue_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -102,6 +102,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Queue_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Queue_AllTests::main') { Zend_Queue_AllTests::main(); } diff --git a/tests/Zend/Queue/CustomTest.php b/tests/Zend/Queue/CustomTest.php index 74fc7ea2ff..a821ab8ac2 100644 --- a/tests/Zend/Queue/CustomTest.php +++ b/tests/Zend/Queue/CustomTest.php @@ -1,6 +1,6 @@ options = [ @@ -117,7 +117,7 @@ public function test_setup() } } - protected function tearDown(): void + protected function tear_down() { } diff --git a/tests/Zend/Queue/MessageTest.php b/tests/Zend/Queue/MessageTest.php index d21ee03f50..a3845680e7 100644 --- a/tests/Zend/Queue/MessageTest.php +++ b/tests/Zend/Queue/MessageTest.php @@ -1,6 +1,6 @@ options = [ @@ -96,7 +96,7 @@ protected function setUp(): void $this->message = new Zend_Queue_Message($this->options); } - protected function tearDown(): void + protected function tear_down() { } diff --git a/tests/Zend/Queue/Queue1Test.php b/tests/Zend/Queue/Queue1Test.php index f91dd6641b..54e748749d 100644 --- a/tests/Zend/Queue/Queue1Test.php +++ b/tests/Zend/Queue/Queue1Test.php @@ -41,7 +41,7 @@ */ class Zend_Queue_Queue1Test extends Zend_Queue_QueueBaseTest { - protected function setUp(): void + protected function set_up() { date_default_timezone_set('GMT'); diff --git a/tests/Zend/Queue/Queue2Test.php b/tests/Zend/Queue/Queue2Test.php index 318b745721..104b1cfcf9 100644 --- a/tests/Zend/Queue/Queue2Test.php +++ b/tests/Zend/Queue/Queue2Test.php @@ -41,7 +41,7 @@ */ class Zend_Queue_Queue2Test extends Zend_Queue_QueueBaseTest { - protected function setUp(): void + protected function set_up() { // Test Zend_Config $this->config = [ diff --git a/tests/Zend/Queue/QueueBaseTest.php b/tests/Zend/Queue/QueueBaseTest.php index 5f364a9a5e..58a2e9ec68 100644 --- a/tests/Zend/Queue/QueueBaseTest.php +++ b/tests/Zend/Queue/QueueBaseTest.php @@ -1,6 +1,6 @@ config = [ @@ -73,7 +73,7 @@ protected function setUp(): void $this->queue = new Zend_Queue('Null', $this->config); } - protected function tearDown(): void + protected function tear_down() { } diff --git a/tests/Zend/Queue/QueueTest.php b/tests/Zend/Queue/QueueTest.php index 509565174a..aade28637c 100644 --- a/tests/Zend/Queue/QueueTest.php +++ b/tests/Zend/Queue/QueueTest.php @@ -1,6 +1,6 @@ config = [ @@ -71,7 +71,7 @@ protected function setUp(): void $this->queue = new Zend_Queue('array', $this->config); } - protected function tearDown(): void + protected function tear_down() { } diff --git a/tests/Zend/Queue/Stomp/ClientTest.php b/tests/Zend/Queue/Stomp/ClientTest.php index 97c596c132..da2168ed09 100644 --- a/tests/Zend/Queue/Stomp/ClientTest.php +++ b/tests/Zend/Queue/Stomp/ClientTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -71,6 +71,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Reflection_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Reflection_AllTests::main') { Zend_Reflection_AllTests::main(); } diff --git a/tests/Zend/Reflection/ClassTest.php b/tests/Zend/Reflection/ClassTest.php index d8c1b34b21..cd20ed6f6f 100644 --- a/tests/Zend/Reflection/ClassTest.php +++ b/tests/Zend/Reflection/ClassTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Reflection_Docblock_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Reflection_Docblock_AllTests::main') { Zend_Reflection_Docblock_AllTests::main(); } diff --git a/tests/Zend/Reflection/Docblock/Tag/ParamTest.php b/tests/Zend/Reflection/Docblock/Tag/ParamTest.php index b8f9ff5dd4..bfd90d42fa 100644 --- a/tests/Zend/Reflection/Docblock/Tag/ParamTest.php +++ b/tests/Zend/Reflection/Docblock/Tag/ParamTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -63,6 +63,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Rest_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Rest_AllTests::main') { Zend_Rest_AllTests::main(); } diff --git a/tests/Zend/Rest/ClientTest.php b/tests/Zend/Rest/ClientTest.php index a1ed5674cf..b0d47d3fa0 100644 --- a/tests/Zend/Rest/ClientTest.php +++ b/tests/Zend/Rest/ClientTest.php @@ -1,6 +1,6 @@ path = dirname(__FILE__) . '/responses/'; diff --git a/tests/Zend/Rest/ControllerTest.php b/tests/Zend/Rest/ControllerTest.php index e6bc8fa93b..0c6043200b 100644 --- a/tests/Zend/Rest/ControllerTest.php +++ b/tests/Zend/Rest/ControllerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $request = new Zend_Controller_Request_HttpTestCase(); $response = new Zend_Controller_Response_HttpTestCase(); @@ -130,6 +130,6 @@ public function test_action_methods() } // Call Zend_Rest_ControllerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Rest_ControllerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Rest_ControllerTest::main") { Zend_Rest_ControllerTest::main(); } diff --git a/tests/Zend/Rest/ResultTest.php b/tests/Zend/Rest/ResultTest.php index 390637a90c..b574d6a7d2 100644 --- a/tests/Zend/Rest/ResultTest.php +++ b/tests/Zend/Rest/ResultTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->_front = Zend_Controller_Front::getInstance(); $this->_front->resetInstance(); @@ -966,6 +966,6 @@ private function _invokeRouteMatch($request, $config = [], $route = null) } // Call Zend_Rest_RouteTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Rest_RouteTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Rest_RouteTest::main") { Zend_Rest_RouteTest::main(); } diff --git a/tests/Zend/Rest/ServerTest.php b/tests/Zend/Rest/ServerTest.php index b7980a4bda..9bf20e9c16 100644 --- a/tests/Zend/Rest/ServerTest.php +++ b/tests/Zend/Rest/ServerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (isset($this->request)) { $_REQUEST = $this->request; @@ -912,6 +912,6 @@ class Zend_Rest_TestException extends Exception } // Call Zend_Rest_ServerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Rest_ServerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Rest_ServerTest::main") { Zend_Rest_ServerTest::main(); } diff --git a/tests/Zend/Search/AllTests.php b/tests/Zend/Search/AllTests.php index 68d208cae2..a3d7daa8bf 100644 --- a/tests/Zend/Search/AllTests.php +++ b/tests/Zend/Search/AllTests.php @@ -42,7 +42,7 @@ class Zend_Search_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Search_Lucene_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Search_Lucene_AllTests::main') { Zend_Search_AllTests::main(); } diff --git a/tests/Zend/Search/Lucene/AllTests.php b/tests/Zend/Search/Lucene/AllTests.php index 1a5be1089b..6df32767d7 100644 --- a/tests/Zend/Search/Lucene/AllTests.php +++ b/tests/Zend/Search/Lucene/AllTests.php @@ -66,7 +66,7 @@ class Zend_Search_Lucene_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -107,6 +107,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Search_Lucene_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Search_Lucene_AllTests::main') { Zend_Search_Lucene_AllTests::main(); } diff --git a/tests/Zend/Search/Lucene/AnalysisTest.php b/tests/Zend/Search/Lucene/AnalysisTest.php index 7037b8e70e..bc6003955f 100644 --- a/tests/Zend/Search/Lucene/AnalysisTest.php +++ b/tests/Zend/Search/Lucene/AnalysisTest.php @@ -1,6 +1,6 @@ assertEquals($field->encoding, 'ISO-8859-1'); $this->assertEquals($field->name, 'field'); - $this->assertEquals($field->value, 'Words with umlauts: åãü...'); + $this->assertEquals($field->value, 'Words with umlauts: ���...'); $this->assertEquals($field->getUtf8Value(), 'Words with umlauts: åãü...'); } } diff --git a/tests/Zend/Search/Lucene/Index/DictionaryLoaderTest.php b/tests/Zend/Search/Lucene/Index/DictionaryLoaderTest.php index fec02424aa..33f886f859 100644 --- a/tests/Zend/Search/Lucene/Index/DictionaryLoaderTest.php +++ b/tests/Zend/Search/Lucene/Index/DictionaryLoaderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } private function _clearDirectory($dirName) @@ -66,7 +66,7 @@ private function _clearDirectory($dirName) closedir($dir); } - protected function setUp(): void + protected function set_up() { $this->_clearDirectory(dirname(__FILE__) . '/_index/_files'); } @@ -581,6 +581,6 @@ public function testIsDeletedWithoutExplicitCommit() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Search_Lucene_LuceneTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Search_Lucene_LuceneTest::main') { Zend_Search_Lucene_LuceneTest::main(); } diff --git a/tests/Zend/Search/Lucene/PriorityQueueTest.php b/tests/Zend/Search/Lucene/PriorityQueueTest.php index 5b40949546..a3c263d191 100644 --- a/tests/Zend/Search/Lucene/PriorityQueueTest.php +++ b/tests/Zend/Search/Lucene/PriorityQueueTest.php @@ -1,6 +1,6 @@ _wildcardMinPrefix = Zend_Search_Lucene_Search_Query_Wildcard::getMinPrefixLength(); @@ -63,7 +63,7 @@ protected function setUp(): void Zend_Search_Lucene_Search_Query_Fuzzy::setDefaultPrefixLength(0); } - protected function tearDown(): void + protected function tear_down() { Zend_Search_Lucene_Search_Query_Wildcard::setMinPrefixLength($this->_wildcardMinPrefix); Zend_Search_Lucene_Search_Query_Fuzzy::setDefaultPrefixLength($this->_defaultPrefixLength); diff --git a/tests/Zend/Search/Lucene/SearchTest.php b/tests/Zend/Search/Lucene/SearchTest.php index ed700a2d2e..5f99e1d188 100644 --- a/tests/Zend/Search/Lucene/SearchTest.php +++ b/tests/Zend/Search/Lucene/SearchTest.php @@ -1,6 +1,6 @@ testFile)) { unlink($this->testFile); diff --git a/tests/Zend/Serializer/Adapter/AllTests.php b/tests/Zend/Serializer/Adapter/AllTests.php index da5b817a47..f3dc026b43 100644 --- a/tests/Zend/Serializer/Adapter/AllTests.php +++ b/tests/Zend/Serializer/Adapter/AllTests.php @@ -89,7 +89,7 @@ class Zend_Serializer_Adapter_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -134,6 +134,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Serializer_Adapter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Serializer_Adapter_AllTests::main') { Zend_Serializer_Adapter_AllTests::main(); } diff --git a/tests/Zend/Serializer/Adapter/Amf0Test.php b/tests/Zend/Serializer/Adapter/Amf0Test.php index 37a2aff7fb..97e2ff06d6 100644 --- a/tests/Zend/Serializer/Adapter/Amf0Test.php +++ b/tests/Zend/Serializer/Adapter/Amf0Test.php @@ -1,6 +1,6 @@ _adapter = new Zend_Serializer_Adapter_Amf0(); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; } diff --git a/tests/Zend/Serializer/Adapter/Amf3Test.php b/tests/Zend/Serializer/Adapter/Amf3Test.php index c2a8fbdca6..aa23d32b08 100644 --- a/tests/Zend/Serializer/Adapter/Amf3Test.php +++ b/tests/Zend/Serializer/Adapter/Amf3Test.php @@ -1,6 +1,6 @@ _adapter = new Zend_Serializer_Adapter_Amf3(); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; } diff --git a/tests/Zend/Serializer/Adapter/IgbinaryTest.php b/tests/Zend/Serializer/Adapter/IgbinaryTest.php index 59918a2218..96a2f3db6e 100644 --- a/tests/Zend/Serializer/Adapter/IgbinaryTest.php +++ b/tests/Zend/Serializer/Adapter/IgbinaryTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Serializer_Adapter_Igbinary(); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; } @@ -159,7 +159,7 @@ class Zend_Serializer_Adapter_IgbinarySkipTest extends TestCase { public $message = null; - protected function setUp(): void + protected function set_up() { $message = 'Skipped Zend_Serializer_Adapter_IgbinaryTest'; if ($this->message) { diff --git a/tests/Zend/Serializer/Adapter/JsonTest.php b/tests/Zend/Serializer/Adapter/JsonTest.php index 5a3c7acdb5..beb627a391 100644 --- a/tests/Zend/Serializer/Adapter/JsonTest.php +++ b/tests/Zend/Serializer/Adapter/JsonTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Serializer_Adapter_Json(); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; } diff --git a/tests/Zend/Serializer/Adapter/PhpCodeTest.php b/tests/Zend/Serializer/Adapter/PhpCodeTest.php index 10888ef138..2b892c6f14 100644 --- a/tests/Zend/Serializer/Adapter/PhpCodeTest.php +++ b/tests/Zend/Serializer/Adapter/PhpCodeTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Serializer_Adapter_PhpCode(); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; } @@ -89,7 +89,7 @@ public function testSerializeObject() { $value = new stdClass(); $data = $this->_adapter->serialize($value); - if (version_compare(phpversion(), '7', '<')) { + if (version_compare(phpversion(), '7.3', '<')) { $expected = "stdClass::__set_state(array(\n))"; $this->assertEquals($expected, $data); } else { diff --git a/tests/Zend/Serializer/Adapter/PhpSerializeTest.php b/tests/Zend/Serializer/Adapter/PhpSerializeTest.php index 05a0c61bf7..00ce98bbaa 100644 --- a/tests/Zend/Serializer/Adapter/PhpSerializeTest.php +++ b/tests/Zend/Serializer/Adapter/PhpSerializeTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Serializer_Adapter_PhpSerialize(); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; } diff --git a/tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol0Test.php b/tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol0Test.php index fa5352b920..d4e64495b2 100644 --- a/tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol0Test.php +++ b/tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol0Test.php @@ -1,6 +1,6 @@ _adapter = new Zend_Serializer_Adapter_PythonPickle(['protocol' => 0]); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; } diff --git a/tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol1Test.php b/tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol1Test.php index 7ac84e5adb..7ea9b14a66 100644 --- a/tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol1Test.php +++ b/tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol1Test.php @@ -1,6 +1,6 @@ _adapter = new Zend_Serializer_Adapter_PythonPickle(['protocol' => 1]); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; } diff --git a/tests/Zend/Serializer/Adapter/PythonPickleUnserializeTest.php b/tests/Zend/Serializer/Adapter/PythonPickleUnserializeTest.php index 80ce654aa6..0d681c007d 100644 --- a/tests/Zend/Serializer/Adapter/PythonPickleUnserializeTest.php +++ b/tests/Zend/Serializer/Adapter/PythonPickleUnserializeTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Serializer_Adapter_PythonPickle(); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; } diff --git a/tests/Zend/Serializer/Adapter/WddxTest.php b/tests/Zend/Serializer/Adapter/WddxTest.php index aaed6d17c9..ea26be707b 100644 --- a/tests/Zend/Serializer/Adapter/WddxTest.php +++ b/tests/Zend/Serializer/Adapter/WddxTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Serializer_Adapter_Wddx(); } - protected function tearDown(): void + protected function tear_down() { $this->_adapter = null; } @@ -260,7 +260,7 @@ class Zend_Serializer_Adapter_WddxSkipTest extends TestCase { public $message = null; - protected function setUp(): void + protected function set_up() { $message = 'Skipped Zend_Serializer_Adapter_WddxTest'; if ($this->message) { diff --git a/tests/Zend/Serializer/AllTests.php b/tests/Zend/Serializer/AllTests.php index f1e2b679b8..7d2cb74896 100644 --- a/tests/Zend/Serializer/AllTests.php +++ b/tests/Zend/Serializer/AllTests.php @@ -49,7 +49,7 @@ class Zend_Serializer_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -70,6 +70,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Serializer_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Serializer_AllTests::main') { Zend_Serializer_AllTests::main(); } diff --git a/tests/Zend/Serializer/SerializerTest.php b/tests/Zend/Serializer/SerializerTest.php index 6cebcbeefb..fb43553db8 100644 --- a/tests/Zend/Serializer/SerializerTest.php +++ b/tests/Zend/Serializer/SerializerTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -80,6 +80,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Server_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Server_AllTests::main') { Zend_Server_AllTests::main(); } diff --git a/tests/Zend/Server/DefinitionTest.php b/tests/Zend/Server/DefinitionTest.php index a73c243c13..a574947a6e 100644 --- a/tests/Zend/Server/DefinitionTest.php +++ b/tests/Zend/Server/DefinitionTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -76,7 +76,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->definition = new Zend_Server_Definition(); } @@ -87,7 +87,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -218,6 +218,6 @@ public function testPassingOptionsToConstructorShouldSetObjectState() } // Call Zend_Server_DefinitionTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Server_DefinitionTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Server_DefinitionTest::main") { Zend_Server_DefinitionTest::main(); } diff --git a/tests/Zend/Server/Method/CallbackTest.php b/tests/Zend/Server/Method/CallbackTest.php index 4aab74cfbe..be54d8acd2 100644 --- a/tests/Zend/Server/Method/CallbackTest.php +++ b/tests/Zend/Server/Method/CallbackTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -67,7 +67,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->callback = new Zend_Server_Method_Callback(); } @@ -78,7 +78,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -169,6 +169,6 @@ public function testSettingFunctionShouldSetTypeAsFunction() } // Call Zend_Server_Method_CallbackTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Server_Method_CallbackTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Server_Method_CallbackTest::main") { Zend_Server_Method_CallbackTest::main(); } diff --git a/tests/Zend/Server/Method/DefinitionTest.php b/tests/Zend/Server/Method/DefinitionTest.php index 3051066dfd..0a1b7490b7 100644 --- a/tests/Zend/Server/Method/DefinitionTest.php +++ b/tests/Zend/Server/Method/DefinitionTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,7 +73,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->definition = new Zend_Server_Method_Definition(); } @@ -84,7 +84,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -258,6 +258,6 @@ public function testPassingOptionsToConstructorShouldSetObjectState() } // Call Zend_Server_Method_DefinitionTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Server_Method_DefinitionTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Server_Method_DefinitionTest::main") { Zend_Server_Method_DefinitionTest::main(); } diff --git a/tests/Zend/Server/Method/ParameterTest.php b/tests/Zend/Server/Method/ParameterTest.php index 4aaf8ccc9e..f734754a84 100644 --- a/tests/Zend/Server/Method/ParameterTest.php +++ b/tests/Zend/Server/Method/ParameterTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -67,7 +67,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->parameter = new Zend_Server_Method_Parameter(); } @@ -78,7 +78,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -204,6 +204,6 @@ public function testConstructorShouldSetObjectStateFromPassedOptions() } // Call Zend_Server_Method_ParameterTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Server_Method_ParameterTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Server_Method_ParameterTest::main") { Zend_Server_Method_ParameterTest::main(); } diff --git a/tests/Zend/Server/Method/PrototypeTest.php b/tests/Zend/Server/Method/PrototypeTest.php index 5506336ac5..bb7be54d25 100644 --- a/tests/Zend/Server/Method/PrototypeTest.php +++ b/tests/Zend/Server/Method/PrototypeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -67,7 +67,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->prototype = new Zend_Server_Method_Prototype(); } @@ -78,7 +78,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -207,6 +207,6 @@ public function testConstructorShouldSetObjectStateFromOptions() } // Call Zend_Server_Method_PrototypeTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Server_Method_PrototypeTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Server_Method_PrototypeTest::main") { Zend_Server_Method_PrototypeTest::main(); } diff --git a/tests/Zend/Server/Reflection/ClassTest.php b/tests/Zend/Server/Reflection/ClassTest.php index 507f98fc76..42c12c33f8 100644 --- a/tests/Zend/Server/Reflection/ClassTest.php +++ b/tests/Zend/Server/Reflection/ClassTest.php @@ -1,6 +1,6 @@ _classRaw = new ReflectionClass('Zend_Server_Reflection'); $this->_method = $this->_classRaw->getMethod('reflectClass'); diff --git a/tests/Zend/Server/Reflection/NodeTest.php b/tests/Zend/Server/Reflection/NodeTest.php index 5dc6b8d147..d0690db724 100644 --- a/tests/Zend/Server/Reflection/NodeTest.php +++ b/tests/Zend/Server/Reflection/NodeTest.php @@ -1,6 +1,6 @@ getMethod('reflectClass'); @@ -81,7 +81,7 @@ protected function setUp(): void /** * Teardown environment */ - protected function tearDown(): void + protected function tear_down() { unset($this->_r); unset($this->_parameters); diff --git a/tests/Zend/Server/Reflection/ReturnValueTest.php b/tests/Zend/Server/Reflection/ReturnValueTest.php index ea78ab6e4f..d51983ece7 100644 --- a/tests/Zend/Server/Reflection/ReturnValueTest.php +++ b/tests/Zend/Server/Reflection/ReturnValueTest.php @@ -1,6 +1,6 @@ akismet = new Zend_Service_Akismet('somebogusapikey', 'http://framework.zend.com/wiki/'); $adapter = new Zend_Http_Client_Adapter_Test(); diff --git a/tests/Zend/Service/AllTests.php b/tests/Zend/Service/AllTests.php index f83239e1c5..50b86d49b1 100644 --- a/tests/Zend/Service/AllTests.php +++ b/tests/Zend/Service/AllTests.php @@ -60,7 +60,7 @@ class Zend_Service_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -91,6 +91,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_AllTests::main') { Zend_Service_AllTests::main(); } diff --git a/tests/Zend/Service/Amazon/AbstractTest.php b/tests/Zend/Service/Amazon/AbstractTest.php index 032a53e6fe..ba1b073cb4 100644 --- a/tests/Zend/Service/Amazon/AbstractTest.php +++ b/tests/Zend/Service/Amazon/AbstractTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -85,6 +85,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Amazon_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Amazon_AllTests::main') { Zend_Service_Amazon_AllTests::main(); } diff --git a/tests/Zend/Service/Amazon/Authentication/AllTests.php b/tests/Zend/Service/Amazon/Authentication/AllTests.php index 86108220d3..3dce15ae21 100644 --- a/tests/Zend/Service/Amazon/Authentication/AllTests.php +++ b/tests/Zend/Service/Amazon/Authentication/AllTests.php @@ -54,7 +54,7 @@ class Zend_Service_Amazon_Authentication_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -80,6 +80,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Amazon_Authentication_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Amazon_Authentication_AllTests::main') { Zend_Service_Amazon_Authentication_AllTests::main(); } diff --git a/tests/Zend/Service/Amazon/Authentication/S3Test.php b/tests/Zend/Service/Amazon/Authentication/S3Test.php index 5ac4c571d2..0cbae48221 100644 --- a/tests/Zend/Service/Amazon/Authentication/S3Test.php +++ b/tests/Zend/Service/Amazon/Authentication/S3Test.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Authentication_S3 = new Zend_Service_Amazon_Authentication_S3('0PN5J17HBGZHT7JJ3X82', 'uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o', '2006-03-01'); @@ -57,14 +57,14 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { - // TODO Auto-generated Zend_Service_Amazon_Authentication_S3Test::tearDown() + // TODO Auto-generated Zend_Service_Amazon_Authentication_S3Test::tear_down() $this->Zend_Service_Amazon_Authentication_S3 = null; - parent::tearDown(); + parent::tear_down(); } diff --git a/tests/Zend/Service/Amazon/Authentication/V1Test.php b/tests/Zend/Service/Amazon/Authentication/V1Test.php index 9db04c223c..69c1d9ff2d 100644 --- a/tests/Zend/Service/Amazon/Authentication/V1Test.php +++ b/tests/Zend/Service/Amazon/Authentication/V1Test.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Authentication_V1 = new Zend_Service_Amazon_Authentication_V1('0PN5J17HBGZHT7JJ3X82', 'uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o', '2007-12-01'); } @@ -59,11 +59,11 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $this->Zend_Service_Amazon_Authentication_V1 = null; - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/Zend/Service/Amazon/Authentication/V2Test.php b/tests/Zend/Service/Amazon/Authentication/V2Test.php index 4a7c1e13b8..26ac3b3d7e 100644 --- a/tests/Zend/Service/Amazon/Authentication/V2Test.php +++ b/tests/Zend/Service/Amazon/Authentication/V2Test.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Authentication_V2 = new Zend_Service_Amazon_Authentication_V2('0PN5J17HBGZHT7JJ3X82', 'uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o', '2009-07-15'); } @@ -54,11 +54,11 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $this->Zend_Service_Amazon_Authentication_V2 = null; - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/Zend/Service/Amazon/Ec2/AbstractTest.php b/tests/Zend/Service/Amazon/Ec2/AbstractTest.php index 821d2fa315..f80e9fd1ad 100644 --- a/tests/Zend/Service/Amazon/Ec2/AbstractTest.php +++ b/tests/Zend/Service/Amazon/Ec2/AbstractTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -88,6 +88,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Amazon_Ec2_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Amazon_Ec2_AllTests::main') { Zend_Service_Amazon_Ec2_AllTests::main(); } diff --git a/tests/Zend/Service/Amazon/Ec2/AvailabilityzonesTest.php b/tests/Zend/Service/Amazon/Ec2/AvailabilityzonesTest.php index 2209eb97bc..ee66d8c524 100644 --- a/tests/Zend/Service/Amazon/Ec2/AvailabilityzonesTest.php +++ b/tests/Zend/Service/Amazon/Ec2/AvailabilityzonesTest.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_Availabilityzones = new Zend_Service_Amazon_Ec2_Availabilityzones('access_key', 'secret_access_key'); @@ -71,13 +71,13 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->adapter); $this->Zend_Service_Amazon_Ec2_Availabilityzones = null; - parent::tearDown(); + parent::tear_down(); } public function testDescribeSingleAvailabilityZone() diff --git a/tests/Zend/Service/Amazon/Ec2/CloudWatchTest.php b/tests/Zend/Service/Amazon/Ec2/CloudWatchTest.php index c84f9fb325..98f8e4f068 100644 --- a/tests/Zend/Service/Amazon/Ec2/CloudWatchTest.php +++ b/tests/Zend/Service/Amazon/Ec2/CloudWatchTest.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_CloudWatch = new Zend_Service_Amazon_Ec2_CloudWatch('access_key', 'secret_access_key'); $adapter = new Zend_Http_Client_Adapter_Test(); $client = new Zend_Http_Client(null, [ @@ -69,12 +69,12 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->adapter); $this->Zend_Service_Amazon_Ec2_CloudWatch = null; - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/Zend/Service/Amazon/Ec2/EbsTest.php b/tests/Zend/Service/Amazon/Ec2/EbsTest.php index f758c38a1a..691cdfed7d 100644 --- a/tests/Zend/Service/Amazon/Ec2/EbsTest.php +++ b/tests/Zend/Service/Amazon/Ec2/EbsTest.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_Ebs = new Zend_Service_Amazon_Ec2_Ebs('access_key', 'secret_access_key'); $adapter = new Zend_Http_Client_Adapter_Test(); @@ -70,12 +70,12 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->adapter); $this->Zend_Service_Amazon_Ec2_Ebs = null; - parent::tearDown(); + parent::tear_down(); } public function testAttachVolume() diff --git a/tests/Zend/Service/Amazon/Ec2/Ec2Test.php b/tests/Zend/Service/Amazon/Ec2/Ec2Test.php index 9a85894cdf..d226cce004 100644 --- a/tests/Zend/Service/Amazon/Ec2/Ec2Test.php +++ b/tests/Zend/Service/Amazon/Ec2/Ec2Test.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_Elasticip = new Zend_Service_Amazon_Ec2_Elasticip('access_key', 'secret_access_key'); @@ -71,13 +71,13 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->adapter); $this->Zend_Service_Amazon_Ec2_Elasticip = null; - parent::tearDown(); + parent::tear_down(); } public function testAllocateNewElasticIp() diff --git a/tests/Zend/Service/Amazon/Ec2/ImageTest.php b/tests/Zend/Service/Amazon/Ec2/ImageTest.php index 06a595df47..a42848dca7 100644 --- a/tests/Zend/Service/Amazon/Ec2/ImageTest.php +++ b/tests/Zend/Service/Amazon/Ec2/ImageTest.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_Image = new Zend_Service_Amazon_Ec2_Image('access_key', 'secret_access_key'); @@ -69,11 +69,11 @@ protected function setUp(): void Zend_Service_Amazon_Ec2_Image::setHttpClient($client); } - protected function tearDown(): void + protected function tear_down() { $this->Zend_Service_Amazon_Ec2_Image = null; - parent::tearDown(); + parent::tear_down(); } public function testDeregister() diff --git a/tests/Zend/Service/Amazon/Ec2/InstanceReservedTest.php b/tests/Zend/Service/Amazon/Ec2/InstanceReservedTest.php index ac9c30b82b..be77bd0550 100644 --- a/tests/Zend/Service/Amazon/Ec2/InstanceReservedTest.php +++ b/tests/Zend/Service/Amazon/Ec2/InstanceReservedTest.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_Instance_Reserved = new Zend_Service_Amazon_Ec2_Instance_Reserved('access_key', 'secret_access_key'); $adapter = new Zend_Http_Client_Adapter_Test(); @@ -72,11 +72,11 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->adapter); $this->Zend_Service_Amazon_Ec2_Instance_Reserved = null; - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/Zend/Service/Amazon/Ec2/InstanceTest.php b/tests/Zend/Service/Amazon/Ec2/InstanceTest.php index e5f89557b2..ca0f8f4cb8 100644 --- a/tests/Zend/Service/Amazon/Ec2/InstanceTest.php +++ b/tests/Zend/Service/Amazon/Ec2/InstanceTest.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_Instance = new Zend_Service_Amazon_Ec2_Instance('access_key', 'secret_access_key'); @@ -72,13 +72,13 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->adapter); $this->Zend_Service_Amazon_Ec2_Instance = null; - parent::tearDown(); + parent::tear_down(); } public function testConstants() diff --git a/tests/Zend/Service/Amazon/Ec2/InstanceWindowsTest.php b/tests/Zend/Service/Amazon/Ec2/InstanceWindowsTest.php index d382862d59..1209ddb5c7 100644 --- a/tests/Zend/Service/Amazon/Ec2/InstanceWindowsTest.php +++ b/tests/Zend/Service/Amazon/Ec2/InstanceWindowsTest.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_Instance_Windows = new Zend_Service_Amazon_Ec2_Instance_Windows('access_key', 'secret_access_key'); $adapter = new Zend_Http_Client_Adapter_Test(); @@ -72,12 +72,12 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->adapter); $this->Zend_Service_Amazon_Ec2_Instance_Windows = null; - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/Zend/Service/Amazon/Ec2/KeypairTest.php b/tests/Zend/Service/Amazon/Ec2/KeypairTest.php index 7d63fd5cf2..239b862ce1 100644 --- a/tests/Zend/Service/Amazon/Ec2/KeypairTest.php +++ b/tests/Zend/Service/Amazon/Ec2/KeypairTest.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_Keypair = new Zend_Service_Amazon_Ec2_Keypair('access_key', 'secret_access_key'); @@ -71,13 +71,13 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->adapter); $this->Zend_Service_Amazon_Ec2_Keypair = null; - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/Zend/Service/Amazon/Ec2/RegionTest.php b/tests/Zend/Service/Amazon/Ec2/RegionTest.php index e89c306ae4..8621ea140f 100644 --- a/tests/Zend/Service/Amazon/Ec2/RegionTest.php +++ b/tests/Zend/Service/Amazon/Ec2/RegionTest.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_Region = new Zend_Service_Amazon_Ec2_Region('access_key', 'secret_access_key'); @@ -76,13 +76,13 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->adapter); $this->Zend_Service_Amazon_Ec2_Availabilityzones = null; - parent::tearDown(); + parent::tear_down(); } public function testDescribeSingleRegion() diff --git a/tests/Zend/Service/Amazon/Ec2/SecuritygroupsTest.php b/tests/Zend/Service/Amazon/Ec2/SecuritygroupsTest.php index 41ada8e9f9..c8308ab9bc 100644 --- a/tests/Zend/Service/Amazon/Ec2/SecuritygroupsTest.php +++ b/tests/Zend/Service/Amazon/Ec2/SecuritygroupsTest.php @@ -1,6 +1,6 @@ Zend_Service_Amazon_Ec2_Securitygroups = new Zend_Service_Amazon_Ec2_Securitygroups('access_key', 'secret_access_key'); @@ -71,13 +71,13 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->adapter); $this->Zend_Service_Amazon_Ec2_Securitygroups = null; - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/Zend/Service/Amazon/OfflineTest.php b/tests/Zend/Service/Amazon/OfflineTest.php index 79c60ff12e..83fc2b2f49 100644 --- a/tests/Zend/Service/Amazon/OfflineTest.php +++ b/tests/Zend/Service/Amazon/OfflineTest.php @@ -1,6 +1,6 @@ _amazon = new Zend_Service_Amazon(constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID')); diff --git a/tests/Zend/Service/Amazon/OnlineTest.php b/tests/Zend/Service/Amazon/OnlineTest.php index 83c0434ac4..83fb6c8875 100644 --- a/tests/Zend/Service/Amazon/OnlineTest.php +++ b/tests/Zend/Service/Amazon/OnlineTest.php @@ -1,6 +1,6 @@ markTestSkipped('Constants AccessKeyId and SecretKey have to be set.'); @@ -344,7 +344,7 @@ public function testQueryAsin() */ class Zend_Service_Amazon_OnlineTest_Skip extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped('Zend_Service_Amazon online tests not enabled with an access key ID in ' . 'TestConfiguration.php'); diff --git a/tests/Zend/Service/Amazon/S3/AllTests.php b/tests/Zend/Service/Amazon/S3/AllTests.php index 8d39f39ecc..ef4e6b1678 100755 --- a/tests/Zend/Service/Amazon/S3/AllTests.php +++ b/tests/Zend/Service/Amazon/S3/AllTests.php @@ -51,7 +51,7 @@ class Zend_Service_Amazon_S3_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -79,6 +79,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Amazon_S3_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Amazon_S3_AllTests::main') { Zend_Service_Amazon_S3_AllTests::main(); } diff --git a/tests/Zend/Service/Amazon/S3/OfflineTest.php b/tests/Zend/Service/Amazon/S3/OfflineTest.php index 92bd027e83..b8a8faa280 100755 --- a/tests/Zend/Service/Amazon/S3/OfflineTest.php +++ b/tests/Zend/Service/Amazon/S3/OfflineTest.php @@ -1,6 +1,6 @@ markTestSkipped('No offline tests for Zend_Service_Amazon_S3'); } diff --git a/tests/Zend/Service/Amazon/S3/OnlineTest.php b/tests/Zend/Service/Amazon/S3/OnlineTest.php index aa1922b214..a219a9ce9a 100755 --- a/tests/Zend/Service/Amazon/S3/OnlineTest.php +++ b/tests/Zend/Service/Amazon/S3/OnlineTest.php @@ -1,6 +1,6 @@ _amazon = new Zend_Service_Amazon_S3( constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID'), @@ -539,7 +539,7 @@ public function testCommonPrefixes() $this->assertEquals($response['objects'][0], 'test-folder/test1'); $this->assertEquals($response['prefixes'][0], 'test-folder/test2-folder/'); } - protected function tearDown(): void + protected function tear_down() { unset($this->_amazon->debug); $this->_amazon->cleanBucket($this->_bucket); @@ -561,7 +561,7 @@ protected function tearDown(): void */ class Zend_Service_Amazon_S3_OnlineTest_Skip extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped('Zend_Service_Amazon_S3 online tests not enabled with an access key ID in ' . 'TestConfiguration.php'); diff --git a/tests/Zend/Service/Amazon/S3/StreamTest.php b/tests/Zend/Service/Amazon/S3/StreamTest.php index 7102d7c96e..fc168e9475 100755 --- a/tests/Zend/Service/Amazon/S3/StreamTest.php +++ b/tests/Zend/Service/Amazon/S3/StreamTest.php @@ -1,6 +1,6 @@ _amazon = new Zend_Service_Amazon_S3( constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID'), @@ -107,7 +107,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { $this->_amazon->unregisterStreamWrapper(); $buckets = $this->_amazon->getBuckets(); @@ -299,7 +299,7 @@ public function testObjectStat() */ class Zend_Service_Amazon_S3_StreamTest_Skip extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped('Zend_Service_Amazon_S3 online tests not enabled with an access key ID and ' . ' secret key ID in TestConfiguration.php'); diff --git a/tests/Zend/Service/Amazon/SimpleDb/AllTests.php b/tests/Zend/Service/Amazon/SimpleDb/AllTests.php index dca0eaffd9..080ee6191a 100644 --- a/tests/Zend/Service/Amazon/SimpleDb/AllTests.php +++ b/tests/Zend/Service/Amazon/SimpleDb/AllTests.php @@ -59,7 +59,7 @@ class Zend_Service_Amazon_SimpleDb_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -87,6 +87,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Amazon_SimpleDb_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Amazon_SimpleDb_AllTests::main') { Zend_Service_Amazon_SimpleDb_AllTests::main(); } diff --git a/tests/Zend/Service/Amazon/SimpleDb/OfflineTest.php b/tests/Zend/Service/Amazon/SimpleDb/OfflineTest.php index c128997a9e..10d024434b 100644 --- a/tests/Zend/Service/Amazon/SimpleDb/OfflineTest.php +++ b/tests/Zend/Service/Amazon/SimpleDb/OfflineTest.php @@ -1,6 +1,6 @@ markTestSkipped('No offline tests for Zend_Service_Amazon_SimpleDb'); } diff --git a/tests/Zend/Service/Amazon/SimpleDb/OnlineTest.php b/tests/Zend/Service/Amazon/SimpleDb/OnlineTest.php index 428d945058..e04539a53e 100644 --- a/tests/Zend/Service/Amazon/SimpleDb/OnlineTest.php +++ b/tests/Zend/Service/Amazon/SimpleDb/OnlineTest.php @@ -1,6 +1,6 @@ _amazon = new Zend_Service_Amazon_SimpleDb( constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID'), @@ -513,7 +513,7 @@ private function _wait() * * @return void */ - protected function tearDown(): void + protected function tear_down() { // $this->request('deleteDomain', array($this->_testDomainNamePrefix)); diff --git a/tests/Zend/Service/Amazon/SimpleDb/PageTest.php b/tests/Zend/Service/Amazon/SimpleDb/PageTest.php index 80d4fad68a..0de6fdd6c0 100644 --- a/tests/Zend/Service/Amazon/SimpleDb/PageTest.php +++ b/tests/Zend/Service/Amazon/SimpleDb/PageTest.php @@ -1,6 +1,6 @@ page = new Zend_Service_Amazon_SimpleDb_Page('foobar'); } diff --git a/tests/Zend/Service/Amazon/Sqs/AllTests.php b/tests/Zend/Service/Amazon/Sqs/AllTests.php index 17716ec410..64ec82fc9a 100644 --- a/tests/Zend/Service/Amazon/Sqs/AllTests.php +++ b/tests/Zend/Service/Amazon/Sqs/AllTests.php @@ -50,7 +50,7 @@ class Zend_Service_Amazon_Sqs_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -78,6 +78,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Amazon_Sqs_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Amazon_Sqs_AllTests::main') { Zend_Service_Amazon_Sqs_AllTests::main(); } diff --git a/tests/Zend/Service/Amazon/Sqs/OfflineTest.php b/tests/Zend/Service/Amazon/Sqs/OfflineTest.php index 778f5973c2..f61fad8c0d 100644 --- a/tests/Zend/Service/Amazon/Sqs/OfflineTest.php +++ b/tests/Zend/Service/Amazon/Sqs/OfflineTest.php @@ -1,6 +1,6 @@ markTestSkipped('No offline tests for Zend_Service_Amazon_Sqs'); diff --git a/tests/Zend/Service/Amazon/Sqs/OnlineTest.php b/tests/Zend/Service/Amazon/Sqs/OnlineTest.php index 1217568d22..d99907ce69 100644 --- a/tests/Zend/Service/Amazon/Sqs/OnlineTest.php +++ b/tests/Zend/Service/Amazon/Sqs/OnlineTest.php @@ -1,6 +1,6 @@ _amazon = new Zend_Service_Amazon_Sqs( constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID'), @@ -117,7 +117,7 @@ public function testSqs() * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->_amazon); } @@ -126,7 +126,7 @@ protected function tearDown(): void class Zend_Service_Amazon_Sqs_OnlineTest_Skip extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped( 'Zend_Service_Amazon_Sqs online tests not enabled with an access key ID in ' diff --git a/tests/Zend/Service/Audioscrobbler/AllTests.php b/tests/Zend/Service/Audioscrobbler/AllTests.php index c98e2fb457..f09797c9ab 100644 --- a/tests/Zend/Service/Audioscrobbler/AllTests.php +++ b/tests/Zend/Service/Audioscrobbler/AllTests.php @@ -49,7 +49,7 @@ class Zend_Service_Audioscrobbler_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() diff --git a/tests/Zend/Service/Audioscrobbler/AudioscrobblerTestCase.php b/tests/Zend/Service/Audioscrobbler/AudioscrobblerTestCase.php index 3e2c5cd7b6..15d52b40f0 100644 --- a/tests/Zend/Service/Audioscrobbler/AudioscrobblerTestCase.php +++ b/tests/Zend/Service/Audioscrobbler/AudioscrobblerTestCase.php @@ -1,6 +1,6 @@ _httpTestAdapter = new Zend_Http_Client_Adapter_Test(); $this->_httpClient = new Zend_Http_Client(); diff --git a/tests/Zend/Service/Delicious/AllTests.php b/tests/Zend/Service/Delicious/AllTests.php index 514c270f51..11420ee461 100644 --- a/tests/Zend/Service/Delicious/AllTests.php +++ b/tests/Zend/Service/Delicious/AllTests.php @@ -57,7 +57,7 @@ class Zend_Service_Delicious_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -86,6 +86,6 @@ public static function suite() } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Delicious_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Delicious_AllTests::main') { Zend_Service_Delicious_AllTests::main(); } diff --git a/tests/Zend/Service/Delicious/PostTest.php b/tests/Zend/Service/Delicious/PostTest.php index 70371cc9ab..de2acc1168 100644 --- a/tests/Zend/Service/Delicious/PostTest.php +++ b/tests/Zend/Service/Delicious/PostTest.php @@ -1,6 +1,6 @@ _delicious = new Zend_Service_Delicious(self::UNAME, self::PASS); diff --git a/tests/Zend/Service/Delicious/PrivateDataTest.php b/tests/Zend/Service/Delicious/PrivateDataTest.php index f54f7b67e6..c0b8ea5c45 100644 --- a/tests/Zend/Service/Delicious/PrivateDataTest.php +++ b/tests/Zend/Service/Delicious/PrivateDataTest.php @@ -1,6 +1,6 @@ setConfig([ diff --git a/tests/Zend/Service/Delicious/PublicDataTest.php b/tests/Zend/Service/Delicious/PublicDataTest.php index 5804acf83a..c05f745301 100644 --- a/tests/Zend/Service/Delicious/PublicDataTest.php +++ b/tests/Zend/Service/Delicious/PublicDataTest.php @@ -1,6 +1,6 @@ setConfig([ diff --git a/tests/Zend/Service/Delicious/SimplePostTest.php b/tests/Zend/Service/Delicious/SimplePostTest.php index 772348bd35..cc68e04c51 100644 --- a/tests/Zend/Service/Delicious/SimplePostTest.php +++ b/tests/Zend/Service/Delicious/SimplePostTest.php @@ -1,6 +1,6 @@ markTestSkipped('Zend_Service_Delicious tests not enabled in TestConfiguration.php'); } diff --git a/tests/Zend/Service/Ebay/AbstractTest.php b/tests/Zend/Service/Ebay/AbstractTest.php index 271c406e6e..d567a15f14 100644 --- a/tests/Zend/Service/Ebay/AbstractTest.php +++ b/tests/Zend/Service/Ebay/AbstractTest.php @@ -1,6 +1,6 @@ _concrete = new Zend_Service_Ebay_AbstractConcrete([]); } diff --git a/tests/Zend/Service/Ebay/AllTests.php b/tests/Zend/Service/Ebay/AllTests.php index 9b0127255e..8a3bf03cd9 100644 --- a/tests/Zend/Service/Ebay/AllTests.php +++ b/tests/Zend/Service/Ebay/AllTests.php @@ -49,7 +49,7 @@ class Zend_Service_Ebay_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -60,6 +60,6 @@ public static function suite() return $suite; } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Ebay_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Ebay_AllTests::main') { Zend_Service_AllTests::main(); } diff --git a/tests/Zend/Service/Ebay/Finding/AllTests.php b/tests/Zend/Service/Ebay/Finding/AllTests.php index 7afd2af0b7..681b94e5a1 100644 --- a/tests/Zend/Service/Ebay/Finding/AllTests.php +++ b/tests/Zend/Service/Ebay/Finding/AllTests.php @@ -49,7 +49,7 @@ class Zend_Service_Ebay_Finding_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -65,6 +65,6 @@ public static function suite() return $suite; } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Ebay_Finding_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Ebay_Finding_AllTests::main') { Zend_Service_AllTests::main(); } diff --git a/tests/Zend/Service/Ebay/Finding/OfflineTest.php b/tests/Zend/Service/Ebay/Finding/OfflineTest.php index 9b22b3f5eb..26149715ed 100644 --- a/tests/Zend/Service/Ebay/Finding/OfflineTest.php +++ b/tests/Zend/Service/Ebay/Finding/OfflineTest.php @@ -1,6 +1,6 @@ _finding = new Zend_Service_Ebay_Finding('foo'); } diff --git a/tests/Zend/Service/Ebay/Finding/OnlineTest.php b/tests/Zend/Service/Ebay/Finding/OnlineTest.php index 22a7cc01cb..7022d24a8c 100644 --- a/tests/Zend/Service/Ebay/Finding/OnlineTest.php +++ b/tests/Zend/Service/Ebay/Finding/OnlineTest.php @@ -1,6 +1,6 @@ _finding = new Zend_Service_Ebay_Finding(constant('TESTS_ZEND_SERVICE_EBAY_ONLINE_APPID')); $this->_httpClientOriginal = Zend_Rest_Client::getHttpClient(); Zend_Rest_Client::setHttpClient(new Zend_Http_Client()); } - protected function tearDown(): void + protected function tear_down() { Zend_Rest_Client::setHttpClient($this->_httpClientOriginal); } @@ -185,7 +185,7 @@ public function testItemsPagination() */ class Zend_Service_Ebay_Finding_OnlineSkipTest extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped('Zend_Service_Ebay online tests not enabled with an APPID in TestConfiguration.php'); } diff --git a/tests/Zend/Service/Flickr/AllTests.php b/tests/Zend/Service/Flickr/AllTests.php index f5eedeff3b..96a21e45f2 100644 --- a/tests/Zend/Service/Flickr/AllTests.php +++ b/tests/Zend/Service/Flickr/AllTests.php @@ -49,7 +49,7 @@ class Zend_Service_Flickr_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -73,6 +73,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Flickr_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Flickr_AllTests::main') { Zend_Service_Flickr_AllTests::main(); } diff --git a/tests/Zend/Service/Flickr/OfflineTest.php b/tests/Zend/Service/Flickr/OfflineTest.php index fa959dc3a0..6c087ead16 100644 --- a/tests/Zend/Service/Flickr/OfflineTest.php +++ b/tests/Zend/Service/Flickr/OfflineTest.php @@ -1,6 +1,6 @@ _flickr = new Zend_Service_Flickr(constant('TESTS_ZEND_SERVICE_FLICKR_ONLINE_APIKEY')); $this->_flickrProxy = new Zend_Service_Flickr_OfflineTest_FlickrProtectedMethodProxy( diff --git a/tests/Zend/Service/Flickr/OnlineTest.php b/tests/Zend/Service/Flickr/OnlineTest.php index 21b7893c55..a1ebd46b98 100644 --- a/tests/Zend/Service/Flickr/OnlineTest.php +++ b/tests/Zend/Service/Flickr/OnlineTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -61,6 +61,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_LiveDocx_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_LiveDocx_AllTests::main') { Zend_Service_LiveDocx_AllTests::main(); } diff --git a/tests/Zend/Service/LiveDocx/LiveDocxTest.php b/tests/Zend/Service/LiveDocx/LiveDocxTest.php index 21e6862cec..7077497189 100644 --- a/tests/Zend/Service/LiveDocx/LiveDocxTest.php +++ b/tests/Zend/Service/LiveDocx/LiveDocxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!constant('TESTS_ZEND_SERVICE_LIVEDOCX_USERNAME') || !constant('TESTS_ZEND_SERVICE_LIVEDOCX_PASSWORD') @@ -71,7 +71,7 @@ protected function setUp(): void } } - public function tearDown(): void + public function tear_down() { if (isset($this->phpLiveDocx)) { foreach ($this->phpLiveDocx->listTemplates() as $template) { @@ -97,6 +97,6 @@ public function testGetVersion() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_LiveDocx_LiveDocxTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_LiveDocx_LiveDocxTest::main') { Zend_Service_LiveDocx_LiveDocxTest::main(); } diff --git a/tests/Zend/Service/LiveDocx/MailMergeTest.php b/tests/Zend/Service/LiveDocx/MailMergeTest.php index e7edb4525a..47ee748804 100644 --- a/tests/Zend/Service/LiveDocx/MailMergeTest.php +++ b/tests/Zend/Service/LiveDocx/MailMergeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!constant('TESTS_ZEND_SERVICE_LIVEDOCX_USERNAME') || !constant('TESTS_ZEND_SERVICE_LIVEDOCX_PASSWORD') @@ -82,7 +82,7 @@ protected function setUp(): void $this->path = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'MailMerge'); } - protected function tearDown(): void + protected function tear_down() { if (isset($this->phpLiveDocx)) { foreach ($this->phpLiveDocx->listTemplates() as $template) { @@ -705,6 +705,6 @@ public function testMultiAssocArrayToArrayOfArrayOfString() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_LiveDocx_MailMergeTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_LiveDocx_MailMergeTest::main') { Zend_Service_LiveDocx_MailMergeTest::main(); } diff --git a/tests/Zend/Service/Rackspace/AllTests.php b/tests/Zend/Service/Rackspace/AllTests.php index 9e99d7f170..0eb6f4aeb2 100644 --- a/tests/Zend/Service/Rackspace/AllTests.php +++ b/tests/Zend/Service/Rackspace/AllTests.php @@ -45,7 +45,7 @@ class Zend_Service_Rackspace_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -61,6 +61,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Rackspace_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Rackspace_AllTests::main') { Zend_Service_Rackspace_AllTests::main(); } diff --git a/tests/Zend/Service/Rackspace/Files/AllTests.php b/tests/Zend/Service/Rackspace/Files/AllTests.php index 4432143f88..69accc0ef8 100644 --- a/tests/Zend/Service/Rackspace/Files/AllTests.php +++ b/tests/Zend/Service/Rackspace/Files/AllTests.php @@ -42,7 +42,7 @@ class Zend_Service_Rackspace_Files_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -56,6 +56,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Rackspace_Files_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Rackspace_Files_AllTests::main') { Zend_Service_Rackspace_Files_AllTests::main(); } diff --git a/tests/Zend/Service/Rackspace/Files/OfflineTest.php b/tests/Zend/Service/Rackspace/Files/OfflineTest.php index 1d1feb027f..7ae663877f 100644 --- a/tests/Zend/Service/Rackspace/Files/OfflineTest.php +++ b/tests/Zend/Service/Rackspace/Files/OfflineTest.php @@ -1,6 +1,6 @@ rackspace = new Zend_Service_Rackspace_Files('foo', 'bar'); diff --git a/tests/Zend/Service/Rackspace/Files/OnlineTest.php b/tests/Zend/Service/Rackspace/Files/OnlineTest.php index 0d7beb1f54..e347261502 100644 --- a/tests/Zend/Service/Rackspace/Files/OnlineTest.php +++ b/tests/Zend/Service/Rackspace/Files/OnlineTest.php @@ -1,6 +1,6 @@ markTestSkipped('Zend_Service_Rackspace_Files_OnlineTest tests are not enabled'); diff --git a/tests/Zend/Service/Rackspace/OfflineTest.php b/tests/Zend/Service/Rackspace/OfflineTest.php index b71ed6a814..d032a68321 100644 --- a/tests/Zend/Service/Rackspace/OfflineTest.php +++ b/tests/Zend/Service/Rackspace/OfflineTest.php @@ -1,6 +1,6 @@ _files = new Zend_Service_Rackspace_Files('foo', 'bar'); $this->_filesPath = dirname(__FILE__) . '/_files'; diff --git a/tests/Zend/Service/Rackspace/Servers/AllTests.php b/tests/Zend/Service/Rackspace/Servers/AllTests.php index 07f212ca94..cb564436f3 100644 --- a/tests/Zend/Service/Rackspace/Servers/AllTests.php +++ b/tests/Zend/Service/Rackspace/Servers/AllTests.php @@ -42,7 +42,7 @@ class Zend_Service_Rackspace_Servers_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -56,6 +56,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Rackspace_Servers_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Rackspace_Servers_AllTests::main') { Zend_Service_Rackspace_Servers_AllTests::main(); } diff --git a/tests/Zend/Service/Rackspace/Servers/OfflineTest.php b/tests/Zend/Service/Rackspace/Servers/OfflineTest.php index 62736256e2..772468078b 100644 --- a/tests/Zend/Service/Rackspace/Servers/OfflineTest.php +++ b/tests/Zend/Service/Rackspace/Servers/OfflineTest.php @@ -1,6 +1,6 @@ rackspace = new Zend_Service_Rackspace_Servers('foo', 'bar'); diff --git a/tests/Zend/Service/Rackspace/Servers/OnlineTest.php b/tests/Zend/Service/Rackspace/Servers/OnlineTest.php index 2cbaaa8634..f2cf2dad1c 100644 --- a/tests/Zend/Service/Rackspace/Servers/OnlineTest.php +++ b/tests/Zend/Service/Rackspace/Servers/OnlineTest.php @@ -1,6 +1,6 @@ markTestSkipped('Zend_Service_Rackspace_Servers_OnlineTest tests are not enabled'); diff --git a/tests/Zend/Service/ReCaptcha/AllTests.php b/tests/Zend/Service/ReCaptcha/AllTests.php index fcf60ba657..4ceccb2db2 100644 --- a/tests/Zend/Service/ReCaptcha/AllTests.php +++ b/tests/Zend/Service/ReCaptcha/AllTests.php @@ -50,7 +50,7 @@ class Zend_Service_ReCaptcha_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -81,6 +81,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_ReCaptcha_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_ReCaptcha_AllTests::main') { Zend_Service_ReCaptcha_AllTests::main(); } diff --git a/tests/Zend/Service/ReCaptcha/MailHideTest.php b/tests/Zend/Service/ReCaptcha/MailHideTest.php index 0920f21f10..068f1bdfdb 100644 --- a/tests/Zend/Service/ReCaptcha/MailHideTest.php +++ b/tests/Zend/Service/ReCaptcha/MailHideTest.php @@ -1,6 +1,6 @@ _mailHide = new Zend_Service_ReCaptcha_MailHide(); } diff --git a/tests/Zend/Service/ReCaptcha/ReCaptchaTest.php b/tests/Zend/Service/ReCaptcha/ReCaptchaTest.php index ab9c8aa5d8..726301ce75 100644 --- a/tests/Zend/Service/ReCaptcha/ReCaptchaTest.php +++ b/tests/Zend/Service/ReCaptcha/ReCaptchaTest.php @@ -1,6 +1,6 @@ _reCaptcha = new Zend_Service_ReCaptcha(); } diff --git a/tests/Zend/Service/ReCaptcha/ResponseTest.php b/tests/Zend/Service/ReCaptcha/ResponseTest.php index d336ccb940..87300acb97 100644 --- a/tests/Zend/Service/ReCaptcha/ResponseTest.php +++ b/tests/Zend/Service/ReCaptcha/ResponseTest.php @@ -1,6 +1,6 @@ _response = new Zend_Service_ReCaptcha_Response(); } diff --git a/tests/Zend/Service/ShortUrl/AllTests.php b/tests/Zend/Service/ShortUrl/AllTests.php index 4a300aa9bd..b04228563b 100644 --- a/tests/Zend/Service/ShortUrl/AllTests.php +++ b/tests/Zend/Service/ShortUrl/AllTests.php @@ -65,7 +65,7 @@ class Zend_Service_ShortUrl_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -82,6 +82,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_ShortUrl_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_ShortUrl_AllTests::main') { Zend_Service_ShortUrl_AllTests::main(); } diff --git a/tests/Zend/Service/ShortUrl/BitLyTest.php b/tests/Zend/Service/ShortUrl/BitLyTest.php index 0ca52de5d4..d3d319142f 100644 --- a/tests/Zend/Service/ShortUrl/BitLyTest.php +++ b/tests/Zend/Service/ShortUrl/BitLyTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -62,6 +62,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_SqlAzure_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_SqlAzure_AllTests::main') { Zend_Service_SqlAzure_AllTests::main(); } diff --git a/tests/Zend/Service/SqlAzure/Management/AllTests.php b/tests/Zend/Service/SqlAzure/Management/AllTests.php index d6f405bcc7..c20f05abd0 100644 --- a/tests/Zend/Service/SqlAzure/Management/AllTests.php +++ b/tests/Zend/Service/SqlAzure/Management/AllTests.php @@ -47,7 +47,7 @@ class Zend_Service_SqlAzure_Management_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_SqlAzure_Management_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_SqlAzure_Management_AllTests::main') { Zend_Service_SqlAzure_Management_AllTests::main(); } diff --git a/tests/Zend/Service/SqlAzure/Management/ManagementClientTest.php b/tests/Zend/Service/SqlAzure/Management/ManagementClientTest.php index 3e5200e87c..ffa9e618b9 100644 --- a/tests/Zend/Service/SqlAzure/Management/ManagementClientTest.php +++ b/tests/Zend/Service/SqlAzure/Management/ManagementClientTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } } /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { // Clean up server $managementClient = $this->createManagementClient(); @@ -143,6 +143,6 @@ public function testCreateAndConfigureServer() } // Call Zend_Service_SqlAzure_Management_ManagementClientTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_SqlAzure_Management_ManagementClientTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_SqlAzure_Management_ManagementClientTest::main") { Zend_Service_SqlAzure_Management_ManagementClientTest::main(); } diff --git a/tests/Zend/Service/StrikeIron/AllTests.php b/tests/Zend/Service/StrikeIron/AllTests.php index 94ee0c7893..f96753b039 100644 --- a/tests/Zend/Service/StrikeIron/AllTests.php +++ b/tests/Zend/Service/StrikeIron/AllTests.php @@ -51,7 +51,7 @@ class Zend_Service_StrikeIron_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -75,6 +75,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_StrikeIron_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_StrikeIron_AllTests::main') { Zend_Service_StrikeIron_AllTests::main(); } diff --git a/tests/Zend/Service/StrikeIron/BaseTest.php b/tests/Zend/Service/StrikeIron/BaseTest.php index 7cbb175209..e4f3c33b35 100644 --- a/tests/Zend/Service/StrikeIron/BaseTest.php +++ b/tests/Zend/Service/StrikeIron/BaseTest.php @@ -1,6 +1,6 @@ soapClient = new Zend_Service_StrikeIron_BaseTest_MockSoapClient(); $this->base = new Zend_Service_StrikeIron_Base(['client' => $this->soapClient, diff --git a/tests/Zend/Service/StrikeIron/DecoratorTest.php b/tests/Zend/Service/StrikeIron/DecoratorTest.php index 9deacf943f..18976f5559 100644 --- a/tests/Zend/Service/StrikeIron/DecoratorTest.php +++ b/tests/Zend/Service/StrikeIron/DecoratorTest.php @@ -1,6 +1,6 @@ soapClient = new Zend_Service_StrikeIron_BaseTest_MockSoapClient(); if (extension_loaded('soap')) { diff --git a/tests/Zend/Service/StrikeIron/SalesUseTaxBasicTest.php b/tests/Zend/Service/StrikeIron/SalesUseTaxBasicTest.php index eb92ce0e8c..397886d82f 100644 --- a/tests/Zend/Service/StrikeIron/SalesUseTaxBasicTest.php +++ b/tests/Zend/Service/StrikeIron/SalesUseTaxBasicTest.php @@ -1,6 +1,6 @@ soapClient = new stdclass(); $this->service = new Zend_Service_StrikeIron_SalesUseTaxBasic(['client' => $this->soapClient]); diff --git a/tests/Zend/Service/StrikeIron/StrikeIronTest.php b/tests/Zend/Service/StrikeIron/StrikeIronTest.php index 88ad638478..304a1ec51f 100644 --- a/tests/Zend/Service/StrikeIron/StrikeIronTest.php +++ b/tests/Zend/Service/StrikeIron/StrikeIronTest.php @@ -1,6 +1,6 @@ soapClient = new stdclass(); diff --git a/tests/Zend/Service/StrikeIron/USAddressVerificationTest.php b/tests/Zend/Service/StrikeIron/USAddressVerificationTest.php index 140cc9181e..e2e6b0c3fc 100644 --- a/tests/Zend/Service/StrikeIron/USAddressVerificationTest.php +++ b/tests/Zend/Service/StrikeIron/USAddressVerificationTest.php @@ -1,6 +1,6 @@ soapClient = new stdclass(); $this->service = new Zend_Service_StrikeIron_USAddressVerification(['client' => $this->soapClient]); diff --git a/tests/Zend/Service/StrikeIron/ZipCodeInfoTest.php b/tests/Zend/Service/StrikeIron/ZipCodeInfoTest.php index 41f5fe2a1f..43a1d233ab 100644 --- a/tests/Zend/Service/StrikeIron/ZipCodeInfoTest.php +++ b/tests/Zend/Service/StrikeIron/ZipCodeInfoTest.php @@ -1,6 +1,6 @@ soapClient = new stdclass(); $this->service = new Zend_Service_StrikeIron_ZipCodeInfo(['client' => $this->soapClient]); diff --git a/tests/Zend/Service/Twitter/AllTests.php b/tests/Zend/Service/Twitter/AllTests.php index 7a02efb110..c5d820d8fa 100644 --- a/tests/Zend/Service/Twitter/AllTests.php +++ b/tests/Zend/Service/Twitter/AllTests.php @@ -48,7 +48,7 @@ class Zend_Service_Twitter_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -67,6 +67,6 @@ public static function suite() } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Twitter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Twitter_AllTests::main') { Zend_Service_Twitter_AllTests::main(); } diff --git a/tests/Zend/Service/Twitter/TwitterTest.php b/tests/Zend/Service/Twitter/TwitterTest.php index 5ad00500d6..109ba74217 100644 --- a/tests/Zend/Service/Twitter/TwitterTest.php +++ b/tests/Zend/Service/Twitter/TwitterTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -633,6 +633,6 @@ public function testUsersSearch() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_TwitterTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_TwitterTest::main') { Zend_Service_TwitterTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/AllTests.php b/tests/Zend/Service/WindowsAzure/AllTests.php index 61b0ba7c83..3fcdde990d 100644 --- a/tests/Zend/Service/WindowsAzure/AllTests.php +++ b/tests/Zend/Service/WindowsAzure/AllTests.php @@ -61,7 +61,7 @@ class Zend_Service_WindowsAzure_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -103,6 +103,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_WindowsAzure_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_WindowsAzure_AllTests::main') { Zend_Service_WindowsAzure_AllTests::main(); } diff --git a/tests/Zend/Service/WindowsAzure/BlobSessionHandlerTest.php b/tests/Zend/Service/WindowsAzure/BlobSessionHandlerTest.php index fa29781703..9372a6cb60 100644 --- a/tests/Zend/Service/WindowsAzure/BlobSessionHandlerTest.php +++ b/tests/Zend/Service/WindowsAzure/BlobSessionHandlerTest.php @@ -57,14 +57,14 @@ public static function main() { if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) { $suite = new TestSuite("Zend_Service_WindowsAzure_BlobSessionHandlerTest"); - $result = (new TestRunner())->run($suite); + $result = (new resources_Runner())->run($suite); } } /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { $storageClient = $this->createStorageInstance(); for ($i = 1; $i <= self::$uniqId; $i++) { @@ -208,6 +208,6 @@ public function testGc() } // Call Zend_Service_WindowsAzure_BlobSessionHandlerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_BlobSessionHandlerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_BlobSessionHandlerTest::main") { Zend_Service_WindowsAzure_BlobSessionHandlerTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/BlobStorageSharedAccessTest.php b/tests/Zend/Service/WindowsAzure/BlobStorageSharedAccessTest.php index 534fd1dc52..afdcd881d5 100644 --- a/tests/Zend/Service/WindowsAzure/BlobStorageSharedAccessTest.php +++ b/tests/Zend/Service/WindowsAzure/BlobStorageSharedAccessTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } } /** * Test setup */ - protected function setUp(): void + protected function set_up() { } /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { $storageClient = $this->createAdministrativeStorageInstance(); for ($i = 1; $i <= self::$uniqId; $i++) { @@ -227,6 +227,6 @@ public function testDifferentAccounts() } // Call Zend_Service_WindowsAzure_BlobStorageSharedAccessTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_BlobStorageSharedAccessTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_BlobStorageSharedAccessTest::main") { Zend_Service_WindowsAzure_BlobStorageSharedAccessTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/BlobStorageTest.php b/tests/Zend/Service/WindowsAzure/BlobStorageTest.php index 82b18181df..c8bda0c281 100644 --- a/tests/Zend/Service/WindowsAzure/BlobStorageTest.php +++ b/tests/Zend/Service/WindowsAzure/BlobStorageTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } } /** * Test setup */ - protected function setUp(): void + protected function set_up() { } /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { $storageClient = $this->createStorageInstance(); for ($i = 1; $i <= self::$uniqId; $i++) { @@ -870,6 +870,6 @@ protected function _createLargeFile() } // Call Zend_Service_WindowsAzure_BlobStorageTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_BlobStorageTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_BlobStorageTest::main") { Zend_Service_WindowsAzure_BlobStorageTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/BlobStreamTest.php b/tests/Zend/Service/WindowsAzure/BlobStreamTest.php index 6fcc5feff8..977cd2eb64 100644 --- a/tests/Zend/Service/WindowsAzure/BlobStreamTest.php +++ b/tests/Zend/Service/WindowsAzure/BlobStreamTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } } /** * Test setup */ - protected function setUp(): void + protected function set_up() { } /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { $storageClient = $this->createStorageInstance(); for ($i = 1; $i <= self::$uniqId; $i++) { @@ -318,6 +318,6 @@ public function testOpendir() } // Call Zend_Service_WindowsAzure_BlobStreamTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_BlobStreamTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_BlobStreamTest::main") { Zend_Service_WindowsAzure_BlobStreamTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/Credentials/AllTests.php b/tests/Zend/Service/WindowsAzure/Credentials/AllTests.php index c78eaf8ea3..e88771a05d 100644 --- a/tests/Zend/Service/WindowsAzure/Credentials/AllTests.php +++ b/tests/Zend/Service/WindowsAzure/Credentials/AllTests.php @@ -49,7 +49,7 @@ class Zend_Service_WindowsAzure_Credentials_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -64,6 +64,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_WindowsAzure_Credentials_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_WindowsAzure_Credentials_AllTests::main') { Zend_Service_WindowsAzure_Credentials_AllTests::main(); } diff --git a/tests/Zend/Service/WindowsAzure/Credentials/SharedAccessSignatureTest.php b/tests/Zend/Service/WindowsAzure/Credentials/SharedAccessSignatureTest.php index 68ff32ebbb..6a43d8ab04 100644 --- a/tests/Zend/Service/WindowsAzure/Credentials/SharedAccessSignatureTest.php +++ b/tests/Zend/Service/WindowsAzure/Credentials/SharedAccessSignatureTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -142,6 +142,6 @@ public function testSignRequestUrl() } // Call Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest::main") { Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/Credentials/SharedKeyLiteTest.php b/tests/Zend/Service/WindowsAzure/Credentials/SharedKeyLiteTest.php index 305012cbeb..013411192e 100644 --- a/tests/Zend/Service/WindowsAzure/Credentials/SharedKeyLiteTest.php +++ b/tests/Zend/Service/WindowsAzure/Credentials/SharedKeyLiteTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -170,6 +170,6 @@ public function testSignForProductionWithQueryString() } // Call Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest::main") { Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/Credentials/SharedKeyTest.php b/tests/Zend/Service/WindowsAzure/Credentials/SharedKeyTest.php index 41df2f0611..a98e037d7d 100644 --- a/tests/Zend/Service/WindowsAzure/Credentials/SharedKeyTest.php +++ b/tests/Zend/Service/WindowsAzure/Credentials/SharedKeyTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -170,6 +170,6 @@ public function testSignForProductionWithQueryString() } // Call Zend_Service_WindowsAzure_Credentials_SharedKeyTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_Credentials_SharedKeyTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_Credentials_SharedKeyTest::main") { Zend_Service_WindowsAzure_Credentials_SharedKeyTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/Diagnostics/AllTests.php b/tests/Zend/Service/WindowsAzure/Diagnostics/AllTests.php index d8002eceff..826151e585 100644 --- a/tests/Zend/Service/WindowsAzure/Diagnostics/AllTests.php +++ b/tests/Zend/Service/WindowsAzure/Diagnostics/AllTests.php @@ -47,7 +47,7 @@ class Zend_Service_WindowsAzure_Diagnostics_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -60,6 +60,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_WindowsAzure_Diagnostics_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_WindowsAzure_Diagnostics_AllTests::main') { Zend_Service_WindowsAzure_Diagnostics_AllTests::main(); } diff --git a/tests/Zend/Service/WindowsAzure/Diagnostics/ManagerTest.php b/tests/Zend/Service/WindowsAzure/Diagnostics/ManagerTest.php index 9a68e655fc..447004e80a 100644 --- a/tests/Zend/Service/WindowsAzure/Diagnostics/ManagerTest.php +++ b/tests/Zend/Service/WindowsAzure/Diagnostics/ManagerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { $storageClient = $this->createStorageInstance(); for ($i = 1; $i <= self::$uniqId; $i++) { @@ -192,6 +192,6 @@ public function testManagerConfigurationExists() } // Call Zend_Service_WindowsAzure_Credentials_SharedKeyTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_Diagnostics_ManagerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_Diagnostics_ManagerTest::main") { Zend_Service_WindowsAzure_Diagnostics_ManagerTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/DynamicTableEntityTest.php b/tests/Zend/Service/WindowsAzure/DynamicTableEntityTest.php index c646157128..0180978253 100644 --- a/tests/Zend/Service/WindowsAzure/DynamicTableEntityTest.php +++ b/tests/Zend/Service/WindowsAzure/DynamicTableEntityTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { $storageClient = $this->createStorageInstance(); for ($i = 1; $i <= self::$uniqId; $i++) { @@ -190,6 +190,6 @@ public function testInsertEntity() } // Call Zend_Service_WindowsAzure_DynamicTableEntityTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_DynamicTableEntityTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_DynamicTableEntityTest::main") { Zend_Service_WindowsAzure_DynamicTableEntityTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/Management/AllTests.php b/tests/Zend/Service/WindowsAzure/Management/AllTests.php index 0b841ad6cc..9ebcf61978 100644 --- a/tests/Zend/Service/WindowsAzure/Management/AllTests.php +++ b/tests/Zend/Service/WindowsAzure/Management/AllTests.php @@ -47,7 +47,7 @@ class Zend_Service_WindowsAzure_Management_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_WindowsAzure_Management_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_WindowsAzure_Management_AllTests::main') { Zend_Service_WindowsAzure_Management_AllTests::main(); } diff --git a/tests/Zend/Service/WindowsAzure/Management/ManagementClientTest.php b/tests/Zend/Service/WindowsAzure/Management/ManagementClientTest.php index e5157098b5..7be4fc25ee 100644 --- a/tests/Zend/Service/WindowsAzure/Management/ManagementClientTest.php +++ b/tests/Zend/Service/WindowsAzure/Management/ManagementClientTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } } /** * Test setup */ - protected function setUp(): void + protected function set_up() { // Upload sample package to Windows Azure $storageClient = $this->createStorageInstance(); @@ -84,7 +84,7 @@ protected function setUp(): void /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { // Clean up storage $storageClient = $this->createStorageInstance(); @@ -207,6 +207,6 @@ public function testHostedService() } // Call Zend_Service_WindowsAzure_Management_ManagementClientTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_Management_ManagementClientTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_Management_ManagementClientTest::main") { Zend_Service_WindowsAzure_Management_ManagementClientTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/QueueStorageTest.php b/tests/Zend/Service/WindowsAzure/QueueStorageTest.php index 29e6c9fa49..b8d1b37691 100644 --- a/tests/Zend/Service/WindowsAzure/QueueStorageTest.php +++ b/tests/Zend/Service/WindowsAzure/QueueStorageTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } } /** * Test setup */ - protected function setUp(): void + protected function set_up() { } /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { $storageClient = $this->createStorageInstance(); for ($i = 1; $i <= self::$uniqId; $i++) { @@ -394,6 +394,6 @@ public function testDeleteMessage() } // Call Zend_Service_WindowsAzure_QueueStorageTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_QueueStorageTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_QueueStorageTest::main") { Zend_Service_WindowsAzure_QueueStorageTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/RetryPolicyTest.php b/tests/Zend/Service/WindowsAzure/RetryPolicyTest.php index 4522f97b90..d913a37670 100644 --- a/tests/Zend/Service/WindowsAzure/RetryPolicyTest.php +++ b/tests/Zend/Service/WindowsAzure/RetryPolicyTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -118,6 +118,6 @@ public function _countRetriesAndThrowExceptions() } // Call Zend_Service_WindowsAzure_RetryPolicyTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_RetryPolicyTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_RetryPolicyTest::main") { Zend_Service_WindowsAzure_RetryPolicyTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/SessionHandlerTest.php b/tests/Zend/Service/WindowsAzure/SessionHandlerTest.php index 9a0ca234c1..84f18a76c2 100644 --- a/tests/Zend/Service/WindowsAzure/SessionHandlerTest.php +++ b/tests/Zend/Service/WindowsAzure/SessionHandlerTest.php @@ -1,6 +1,6 @@ markTestSkipped('This test case requires TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS to be enabled in TestConfiguration.php'); @@ -61,7 +61,7 @@ protected function setUp(): void /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { if ($this->status == BaseTestRunner::STATUS_SKIPPED) { return; diff --git a/tests/Zend/Service/WindowsAzure/StorageTest.php b/tests/Zend/Service/WindowsAzure/StorageTest.php index 52b752da72..dc84e0a361 100644 --- a/tests/Zend/Service/WindowsAzure/StorageTest.php +++ b/tests/Zend/Service/WindowsAzure/StorageTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,6 +74,6 @@ public function testConstructorForProduction() } // Call Zend_Service_WindowsAzure_StorageTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_StorageTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_StorageTest::main") { Zend_Service_WindowsAzure_StorageTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/TableEntityQueryTest.php b/tests/Zend/Service/WindowsAzure/TableEntityQueryTest.php index aa38425997..91c9030b72 100644 --- a/tests/Zend/Service/WindowsAzure/TableEntityQueryTest.php +++ b/tests/Zend/Service/WindowsAzure/TableEntityQueryTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -188,6 +188,6 @@ public function testWhereMultipleQuery() } // Call Zend_Service_WindowsAzure_TableEntityQueryTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_TableEntityQueryTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_TableEntityQueryTest::main") { Zend_Service_WindowsAzure_TableEntityQueryTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/TableEntityTest.php b/tests/Zend/Service/WindowsAzure/TableEntityTest.php index 8617e5438c..8afec9ceca 100644 --- a/tests/Zend/Service/WindowsAzure/TableEntityTest.php +++ b/tests/Zend/Service/WindowsAzure/TableEntityTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -152,6 +152,6 @@ class TSETTest_TestEntity extends Zend_Service_WindowsAzure_Storage_TableEntity } // Call Zend_Service_WindowsAzure_TableEntityTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_TableEntityTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_TableEntityTest::main") { Zend_Service_WindowsAzure_TableEntityTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/TableSessionHandlerTest.php b/tests/Zend/Service/WindowsAzure/TableSessionHandlerTest.php index 5b96457e06..600f63e210 100644 --- a/tests/Zend/Service/WindowsAzure/TableSessionHandlerTest.php +++ b/tests/Zend/Service/WindowsAzure/TableSessionHandlerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } } /** * Test setup */ - protected function setUp(): void + protected function set_up() { } /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { $storageClient = $this->createStorageInstance(); for ($i = 1; $i <= self::$uniqId; $i++) { @@ -294,6 +294,6 @@ protected function session_id() } // Call Zend_Service_WindowsAzure_TableSessionHandlerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_TableSessionHandlerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_TableSessionHandlerTest::main") { Zend_Service_WindowsAzure_TableSessionHandlerTest::main(); } diff --git a/tests/Zend/Service/WindowsAzure/TableStorageTest.php b/tests/Zend/Service/WindowsAzure/TableStorageTest.php index 47708cef54..271daa7841 100644 --- a/tests/Zend/Service/WindowsAzure/TableStorageTest.php +++ b/tests/Zend/Service/WindowsAzure/TableStorageTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } } /** * Test setup */ - protected function setUp(): void + protected function set_up() { } /** * Test teardown */ - protected function tearDown(): void + protected function tear_down() { $storageClient = $this->createStorageInstance(); for ($i = 1; $i <= self::$uniqId; $i++) { @@ -920,6 +920,6 @@ class TSTest_TestEntity2 extends Zend_Service_WindowsAzure_Storage_TableEntity } // Call Zend_Service_WindowsAzure_TableStorageTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_TableStorageTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Service_WindowsAzure_TableStorageTest::main") { Zend_Service_WindowsAzure_TableStorageTest::main(); } diff --git a/tests/Zend/Service/Yahoo/AllTests.php b/tests/Zend/Service/Yahoo/AllTests.php index adcc6d0554..0c48bfbe7e 100644 --- a/tests/Zend/Service/Yahoo/AllTests.php +++ b/tests/Zend/Service/Yahoo/AllTests.php @@ -49,7 +49,7 @@ class Zend_Service_Yahoo_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -74,6 +74,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Service_Yahoo_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Service_Yahoo_AllTests::main') { Zend_Service_Yahoo_AllTests::main(); } diff --git a/tests/Zend/Service/Yahoo/OfflineTest.php b/tests/Zend/Service/Yahoo/OfflineTest.php index eec760ddff..4178c9eb15 100644 --- a/tests/Zend/Service/Yahoo/OfflineTest.php +++ b/tests/Zend/Service/Yahoo/OfflineTest.php @@ -1,6 +1,6 @@ _yahoo = new Zend_Service_Yahoo(constant('TESTS_ZEND_SERVICE_YAHOO_ONLINE_APPID')); diff --git a/tests/Zend/Service/Yahoo/OnlineTest.php b/tests/Zend/Service/Yahoo/OnlineTest.php index f78f557413..a3c4089083 100644 --- a/tests/Zend/Service/Yahoo/OnlineTest.php +++ b/tests/Zend/Service/Yahoo/OnlineTest.php @@ -1,6 +1,6 @@ _yahoo = new Zend_Service_Yahoo(constant('TESTS_ZEND_SERVICE_YAHOO_ONLINE_APPID')); @@ -376,7 +376,7 @@ public function testWebSearchForSite() */ class Zend_Service_Yahoo_OnlineTest_Skip extends TestCase { - protected function setUp(): void + protected function set_up() { $this->markTestSkipped('Zend_Service_Yahoo online tests not enabled with an APPID in TestConfiguration.php'); } diff --git a/tests/Zend/Session/AllTests.php b/tests/Zend/Session/AllTests.php index bb5d1a95af..1dd0956b57 100644 --- a/tests/Zend/Session/AllTests.php +++ b/tests/Zend/Session/AllTests.php @@ -48,7 +48,7 @@ class Zend_Session_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -67,6 +67,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Session_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Session_AllTests::main') { Zend_Session_AllTests::main(); } diff --git a/tests/Zend/Session/SaveHandler/AllTests.php b/tests/Zend/Session/SaveHandler/AllTests.php index c7eecd195b..7fc45f6fbe 100644 --- a/tests/Zend/Session/SaveHandler/AllTests.php +++ b/tests/Zend/Session/SaveHandler/AllTests.php @@ -47,7 +47,7 @@ class Zend_Session_SaveHandler_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -69,6 +69,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Session_SaveHandler_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Session_SaveHandler_AllTests::main') { Zend_Session_SaveHandler_AllTests::main(); } diff --git a/tests/Zend/Session/SaveHandler/DbTableTest.php b/tests/Zend/Session/SaveHandler/DbTableTest.php index 68e3a019b5..726962c001 100644 --- a/tests/Zend/Session/SaveHandler/DbTableTest.php +++ b/tests/Zend/Session/SaveHandler/DbTableTest.php @@ -1,6 +1,6 @@ _setupDb($this->_saveHandlerTableConfig['primary']); @@ -91,7 +91,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { if ($this->_db instanceof Zend_Db_Adapter_Abstract) { $this->_dropTable(); diff --git a/tests/Zend/Session/SessionTest.php b/tests/Zend/Session/SessionTest.php index ec111280b0..d31b108725 100644 --- a/tests/Zend/Session/SessionTest.php +++ b/tests/Zend/Session/SessionTest.php @@ -1,7 +1,7 @@ _savePath); diff --git a/tests/Zend/Session/Validator/NoticeValidator.php b/tests/Zend/Session/Validator/NoticeValidator.php index 86a75ee8aa..0a06c84d49 100644 --- a/tests/Zend/Session/Validator/NoticeValidator.php +++ b/tests/Zend/Session/Validator/NoticeValidator.php @@ -41,7 +41,7 @@ class Zend_Session_Validator_NoticeValidator extends Zend_Session_Validator_Abst * @access public * @return void */ - public function setup() + public function set_up() { $this->getValidData(); } diff --git a/tests/Zend/Soap/AllTests.php b/tests/Zend/Soap/AllTests.php index 5099a630d3..37a8fef3ff 100644 --- a/tests/Zend/Soap/AllTests.php +++ b/tests/Zend/Soap/AllTests.php @@ -48,7 +48,7 @@ class Zend_Soap_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -77,6 +77,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Soap_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Soap_AllTests::main') { Zend_Soap_AllTests::main(); } diff --git a/tests/Zend/Soap/AutoDiscover/OnlineTest.php b/tests/Zend/Soap/AutoDiscover/OnlineTest.php index dd6e53d1b7..bbd186bff2 100644 --- a/tests/Zend/Soap/AutoDiscover/OnlineTest.php +++ b/tests/Zend/Soap/AutoDiscover/OnlineTest.php @@ -1,6 +1,6 @@ markTestSkipped('The constant TESTS_ZEND_SOAP_AUTODISCOVER_ONLINE_SERVER_BASEURI has to be defined to allow the Online test to work.'); diff --git a/tests/Zend/Soap/AutoDiscoverTest.php b/tests/Zend/Soap/AutoDiscoverTest.php index d9105a810f..3c51442143 100644 --- a/tests/Zend/Soap/AutoDiscoverTest.php +++ b/tests/Zend/Soap/AutoDiscoverTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (!extension_loaded('soap')) { $this->markTestSkipped('SOAP Extension is not loaded'); @@ -706,6 +706,6 @@ function Zend_Soap_Client_TestFunc6() return "string"; } -if (PHPUnit_MAIN_METHOD == 'Zend_Soap_ClientTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Soap_ClientTest::main') { Zend_Soap_ClientTest::main(); } diff --git a/tests/Zend/Soap/ServerTest.php b/tests/Zend/Soap/ServerTest.php index bf3281cbd3..cc89aaefb5 100644 --- a/tests/Zend/Soap/ServerTest.php +++ b/tests/Zend/Soap/ServerTest.php @@ -1,6 +1,6 @@ markTestSkipped('SOAP Extension is not loaded'); diff --git a/tests/Zend/Soap/Wsdl/AllTests.php b/tests/Zend/Soap/Wsdl/AllTests.php index a6846a4255..4a76f5695f 100644 --- a/tests/Zend/Soap/Wsdl/AllTests.php +++ b/tests/Zend/Soap/Wsdl/AllTests.php @@ -54,6 +54,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Soap_Wsdl_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Soap_Wsdl_AllTests::main') { Zend_Soap_Wsdl_AllTests::main(); } diff --git a/tests/Zend/Soap/Wsdl/ArrayOfTypeComplexStrategyTest.php b/tests/Zend/Soap/Wsdl/ArrayOfTypeComplexStrategyTest.php index 5faa993e2f..0e06b4e763 100644 --- a/tests/Zend/Soap/Wsdl/ArrayOfTypeComplexStrategyTest.php +++ b/tests/Zend/Soap/Wsdl/ArrayOfTypeComplexStrategyTest.php @@ -1,6 +1,6 @@ strategy = new Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex(); $this->wsdl = new Zend_Soap_Wsdl('MyService', 'http://localhost/MyService.php', $this->strategy); diff --git a/tests/Zend/Soap/Wsdl/ArrayOfTypeSequenceStrategyTest.php b/tests/Zend/Soap/Wsdl/ArrayOfTypeSequenceStrategyTest.php index ba7f740f03..2bf4c7cb20 100644 --- a/tests/Zend/Soap/Wsdl/ArrayOfTypeSequenceStrategyTest.php +++ b/tests/Zend/Soap/Wsdl/ArrayOfTypeSequenceStrategyTest.php @@ -1,6 +1,6 @@ strategy = new Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence(); $this->wsdl = new Zend_Soap_Wsdl('MyService', 'http://localhost/MyService.php', $this->strategy); diff --git a/tests/Zend/Soap/Wsdl/CompositeStrategyTest.php b/tests/Zend/Soap/Wsdl/CompositeStrategyTest.php index f592838fd1..2bdd196bf3 100644 --- a/tests/Zend/Soap/Wsdl/CompositeStrategyTest.php +++ b/tests/Zend/Soap/Wsdl/CompositeStrategyTest.php @@ -1,6 +1,6 @@ strategy = new Zend_Soap_Wsdl_Strategy_DefaultComplexType(); $this->wsdl = new Zend_Soap_Wsdl("TestService", "http://framework.zend.com/soap/unittests"); diff --git a/tests/Zend/Soap/WsdlTest.php b/tests/Zend/Soap/WsdlTest.php index c6b235b722..eb8fc44801 100644 --- a/tests/Zend/Soap/WsdlTest.php +++ b/tests/Zend/Soap/WsdlTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Stdlib_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Stdlib_AllTests::main') { Zend_Stdlib_AllTests::main(); } diff --git a/tests/Zend/Stdlib/CallbackHandlerTest.php b/tests/Zend/Stdlib/CallbackHandlerTest.php index e614c5da3c..d3c65851ed 100644 --- a/tests/Zend/Stdlib/CallbackHandlerTest.php +++ b/tests/Zend/Stdlib/CallbackHandlerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (isset($this->args)) { unset($this->args); @@ -159,6 +159,6 @@ public function handleCall() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Stdlib_CallbackHandlerTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Stdlib_CallbackHandlerTest::main') { Zend_Stdlib_CallbackHandlerTest::main(); } diff --git a/tests/Zend/Stdlib/PriorityQueueTest.php b/tests/Zend/Stdlib/PriorityQueueTest.php index 8cc174c23f..0f96600fa8 100644 --- a/tests/Zend/Stdlib/PriorityQueueTest.php +++ b/tests/Zend/Stdlib/PriorityQueueTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->queue = new Zend_Stdlib_PriorityQueue(); $this->queue->insert('foo', 3); @@ -151,6 +151,6 @@ public function testCanTestForExistenceOfPriorityInQueue() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Stdlib_PriorityQueueTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Stdlib_PriorityQueueTest::main') { Zend_Stdlib_PriorityQueueTest::main(); } diff --git a/tests/Zend/Stdlib/SplPriorityQueueTest.php b/tests/Zend/Stdlib/SplPriorityQueueTest.php index a8e090fffc..30560fef4e 100644 --- a/tests/Zend/Stdlib/SplPriorityQueueTest.php +++ b/tests/Zend/Stdlib/SplPriorityQueueTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->queue = new Zend_Stdlib_SplPriorityQueue(); $this->queue->insert('foo', 3); @@ -108,6 +108,6 @@ public function testCanRetrieveQueueAsArray() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Stdlib_SplPriorityQueueTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Stdlib_SplPriorityQueueTest::main') { Zend_Stdlib_SplPriorityQueueTest::main(); } diff --git a/tests/Zend/Tag/AllTests.php b/tests/Zend/Tag/AllTests.php index 2bf3ff639b..5a9c538c7c 100644 --- a/tests/Zend/Tag/AllTests.php +++ b/tests/Zend/Tag/AllTests.php @@ -44,7 +44,7 @@ class Zend_Tag_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Tag_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tag_AllTests::main') { Zend_Tag_AllTests::main(); } diff --git a/tests/Zend/Tag/Cloud/AllTests.php b/tests/Zend/Tag/Cloud/AllTests.php index 60b0cb77ef..e96ee2a0a7 100644 --- a/tests/Zend/Tag/Cloud/AllTests.php +++ b/tests/Zend/Tag/Cloud/AllTests.php @@ -44,7 +44,7 @@ class Zend_Tag_Cloud_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -58,6 +58,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Tag_Cloud_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tag_Cloud_AllTests::main') { Zend_Tag_Cloud_AllTests::main(); } diff --git a/tests/Zend/Tag/Cloud/CloudTest.php b/tests/Zend/Tag/Cloud/CloudTest.php index a8f8bf7fe1..249732ffc7 100644 --- a/tests/Zend/Tag/Cloud/CloudTest.php +++ b/tests/Zend/Tag/Cloud/CloudTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testGetAndSetItemList() @@ -349,6 +349,6 @@ class Zend_Tag_ItemListDummy extends Zend_Tag_ItemList { } -if (PHPUnit_MAIN_METHOD == 'Zend_Tag_Cloud_CloudTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tag_Cloud_CloudTest::main') { Zend_Tag_Cloud_CloudTest::main(); } diff --git a/tests/Zend/Tag/Cloud/Decorator/AllTests.php b/tests/Zend/Tag/Cloud/Decorator/AllTests.php index b6aeb9f8b9..e05eaac12e 100644 --- a/tests/Zend/Tag/Cloud/Decorator/AllTests.php +++ b/tests/Zend/Tag/Cloud/Decorator/AllTests.php @@ -44,7 +44,7 @@ class Zend_Tag_Cloud_Decorator_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -58,6 +58,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Tag_Cloud_Decorator_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tag_Cloud_Decorator_AllTests::main') { Zend_Tag_Cloud_Decorator_AllTests::main(); } diff --git a/tests/Zend/Tag/Cloud/Decorator/HtmlCloudTest.php b/tests/Zend/Tag/Cloud/Decorator/HtmlCloudTest.php index 22e495b86d..a7fb70c819 100644 --- a/tests/Zend/Tag/Cloud/Decorator/HtmlCloudTest.php +++ b/tests/Zend/Tag/Cloud/Decorator/HtmlCloudTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testDefaultOutput() @@ -101,7 +101,7 @@ public function testSkipOptions() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Tag_Cloud_Decorator_HtmlCloudTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tag_Cloud_Decorator_HtmlCloudTest::main') { Zend_Tag_Cloud_Decorator_HtmlCloudTest::main(); } /** diff --git a/tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php b/tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php index ceb7e17b64..84146ae346 100644 --- a/tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php +++ b/tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testDefaultOutput() @@ -203,6 +203,6 @@ protected function _getTagList() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Tag_Cloud_Decorator_HtmlTagTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tag_Cloud_Decorator_HtmlTagTest::main') { Zend_Tag_Cloud_Decorator_HtmlTagTest::main(); } diff --git a/tests/Zend/Tag/ItemListTest.php b/tests/Zend/Tag/ItemListTest.php index 4bd28fba89..e84b627685 100644 --- a/tests/Zend/Tag/ItemListTest.php +++ b/tests/Zend/Tag/ItemListTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testArrayAccessAndCount() @@ -160,6 +160,6 @@ protected function _getItem($title = 'foo', $weight = 1) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Tag_ItemListTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tag_ItemListTest::main') { Zend_Tag_ItemListTest::main(); } diff --git a/tests/Zend/Tag/ItemTest.php b/tests/Zend/Tag/ItemTest.php index a0875c7b65..4dcd74bff7 100644 --- a/tests/Zend/Tag/ItemTest.php +++ b/tests/Zend/Tag/ItemTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testConstuctor() @@ -178,6 +178,6 @@ public function testGetNonSetParam() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Tag_ItemTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tag_ItemTest::main') { Zend_Tag_ItemTest::main(); } diff --git a/tests/Zend/Test/AllTests.php b/tests/Zend/Test/AllTests.php index 38317a82da..3c3ebcac92 100644 --- a/tests/Zend/Test/AllTests.php +++ b/tests/Zend/Test/AllTests.php @@ -44,7 +44,7 @@ class Zend_Test_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Test_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Test_AllTests::main') { Zend_Test_AllTests::main(); } diff --git a/tests/Zend/Test/DbAdapterTest.php b/tests/Zend/Test/DbAdapterTest.php index bb58e0a31f..57ee55d4b6 100644 --- a/tests/Zend/Test/DbAdapterTest.php +++ b/tests/Zend/Test/DbAdapterTest.php @@ -1,6 +1,6 @@ _adapter = new Zend_Test_DbAdapter(); } diff --git a/tests/Zend/Test/DbStatementTest.php b/tests/Zend/Test/DbStatementTest.php index a8e2e97f39..6e6380d1e1 100644 --- a/tests/Zend/Test/DbStatementTest.php +++ b/tests/Zend/Test/DbStatementTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -60,6 +60,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Test_PHPUnit_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Test_PHPUnit_AllTests::main') { Zend_Test_PHPUnit_AllTests::main(); } diff --git a/tests/Zend/Test/PHPUnit/Constraint/AllTests.php b/tests/Zend/Test/PHPUnit/Constraint/AllTests.php index b3712fc6c2..3148be0854 100644 --- a/tests/Zend/Test/PHPUnit/Constraint/AllTests.php +++ b/tests/Zend/Test/PHPUnit/Constraint/AllTests.php @@ -43,7 +43,7 @@ class Zend_Test_PHPUnit_Constraint_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -56,6 +56,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Test_PHPUnit_Constraint_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Test_PHPUnit_Constraint_AllTests::main') { Zend_Test_PHPUnit_Constraint_AllTests::main(); } diff --git a/tests/Zend/Test/PHPUnit/Constraint/DomQueryTest.php b/tests/Zend/Test/PHPUnit/Constraint/DomQueryTest.php index cdc95ebb97..e6f0e79d71 100644 --- a/tests/Zend/Test/PHPUnit/Constraint/DomQueryTest.php +++ b/tests/Zend/Test/PHPUnit/Constraint/DomQueryTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -77,7 +77,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $_SESSION = []; $this->expectException(null); @@ -92,7 +92,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { $registry = Zend_Registry::getInstance(); if (isset($registry['router'])) { @@ -723,7 +723,7 @@ public function testSuperGlobalArraysShouldBeClearedDuringSetUp() ->setPost('foo', 'bar') ->setCookie('bar', 'baz'); - $this->testCase->setUp(); + $this->testCase->set_up(); $this->assertNull($request->getQuery('mr'), 'Retrieved mr get parameter: ' . var_export($request->getQuery(), 1)); $this->assertNull($request->getPost('foo'), 'Retrieved foo post parameter: ' . var_export($request->getPost(), 1)); $this->assertNull($request->getCookie('bar'), 'Retrieved bar cookie parameter: ' . var_export($request->getCookie(), 1)); @@ -888,6 +888,6 @@ class Zend_Test_PHPUnit_ControllerTestCaseTest_Concrete extends Zend_Test_PHPUni } // Call Zend_Test_PHPUnit_ControllerTestCaseTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Test_PHPUnit_ControllerTestCaseTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Test_PHPUnit_ControllerTestCaseTest::main") { Zend_Test_PHPUnit_ControllerTestCaseTest::main(); } diff --git a/tests/Zend/Test/PHPUnit/Db/AllTests.php b/tests/Zend/Test/PHPUnit/Db/AllTests.php index 42ffe7a1e3..5ecb30b7ea 100644 --- a/tests/Zend/Test/PHPUnit/Db/AllTests.php +++ b/tests/Zend/Test/PHPUnit/Db/AllTests.php @@ -49,7 +49,7 @@ class Zend_Test_PHPUnit_Db_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -69,6 +69,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Test_PHPUnit_Db_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Test_PHPUnit_Db_AllTests::main') { Zend_Test_PHPUnit_Db_AllTests::main(); } diff --git a/tests/Zend/Test/PHPUnit/Db/ConnectionTest.php b/tests/Zend/Test/PHPUnit/Db/ConnectionTest.php index 3d79dbebcf..5dd44c846d 100644 --- a/tests/Zend/Test/PHPUnit/Db/ConnectionTest.php +++ b/tests/Zend/Test/PHPUnit/Db/ConnectionTest.php @@ -1,6 +1,6 @@ adapterMock = $this->createMock('Zend_Test_DbAdapter'); } diff --git a/tests/Zend/Test/PHPUnit/Db/DataSet/AllTests.php b/tests/Zend/Test/PHPUnit/Db/DataSet/AllTests.php index 3d5defbc23..4ff35195be 100644 --- a/tests/Zend/Test/PHPUnit/Db/DataSet/AllTests.php +++ b/tests/Zend/Test/PHPUnit/Db/DataSet/AllTests.php @@ -46,7 +46,7 @@ class Zend_Test_PHPUnit_Db_DataSet_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -63,6 +63,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Test_PHPUnit_Db_DataSet_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Test_PHPUnit_Db_DataSet_AllTests::main') { Zend_Test_PHPUnit_Db_DataSet_AllTests::main(); } diff --git a/tests/Zend/Test/PHPUnit/Db/DataSet/DataSetTestCase.php b/tests/Zend/Test/PHPUnit/Db/DataSet/DataSetTestCase.php index d94dc82e11..38783b2e33 100644 --- a/tests/Zend/Test/PHPUnit/Db/DataSet/DataSetTestCase.php +++ b/tests/Zend/Test/PHPUnit/Db/DataSet/DataSetTestCase.php @@ -1,6 +1,6 @@ connectionMock = $this->createMock('Zend_Test_PHPUnit_Db_Connection'); } diff --git a/tests/Zend/Test/PHPUnit/Db/DataSet/DbRowsetTest.php b/tests/Zend/Test/PHPUnit/Db/DataSet/DbRowsetTest.php index 44b3b090f8..48ed8eef54 100644 --- a/tests/Zend/Test/PHPUnit/Db/DataSet/DbRowsetTest.php +++ b/tests/Zend/Test/PHPUnit/Db/DataSet/DbRowsetTest.php @@ -1,6 +1,6 @@ markTestSkipped('Database tests are not enabled.'); diff --git a/tests/Zend/Test/PHPUnit/Db/Integration/SqLiteIntegrationTest.php b/tests/Zend/Test/PHPUnit/Db/Integration/SqLiteIntegrationTest.php index 4dce1a65db..a71aa0cb79 100644 --- a/tests/Zend/Test/PHPUnit/Db/Integration/SqLiteIntegrationTest.php +++ b/tests/Zend/Test/PHPUnit/Db/Integration/SqLiteIntegrationTest.php @@ -32,7 +32,7 @@ */ class Zend_Test_PHPUnit_Db_Integration_SqLiteIntegrationTest extends Zend_Test_PHPUnit_Db_Integration_AbstractTestCase { - protected function setUp(): void + protected function set_up() { if (!extension_loaded('pdo')) { $this->markTestSkipped('PDO is required for this test.'); diff --git a/tests/Zend/Test/PHPUnit/Db/Metadata/GenericTest.php b/tests/Zend/Test/PHPUnit/Db/Metadata/GenericTest.php index 033c089e5b..395ce66128 100644 --- a/tests/Zend/Test/PHPUnit/Db/Metadata/GenericTest.php +++ b/tests/Zend/Test/PHPUnit/Db/Metadata/GenericTest.php @@ -1,6 +1,6 @@ adapterMock = $this->createMock('Zend_Test_DbAdapter'); $this->metadata = new Zend_Test_PHPUnit_Db_Metadata_Generic($this->adapterMock, "schema"); diff --git a/tests/Zend/Test/PHPUnit/Db/Operation/AllTests.php b/tests/Zend/Test/PHPUnit/Db/Operation/AllTests.php index 3c49ca4907..755093f752 100644 --- a/tests/Zend/Test/PHPUnit/Db/Operation/AllTests.php +++ b/tests/Zend/Test/PHPUnit/Db/Operation/AllTests.php @@ -44,7 +44,7 @@ class Zend_Test_PHPUnit_Db_Operation_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Test_PHPUnit_Db_Operation_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Test_PHPUnit_Db_Operation_AllTests::main') { Zend_Test_PHPUnit_Db_Operation_AllTests::main(); } diff --git a/tests/Zend/Test/PHPUnit/Db/Operation/DeleteAllTest.php b/tests/Zend/Test/PHPUnit/Db/Operation/DeleteAllTest.php index 7dc5569d09..f21deb6e60 100644 --- a/tests/Zend/Test/PHPUnit/Db/Operation/DeleteAllTest.php +++ b/tests/Zend/Test/PHPUnit/Db/Operation/DeleteAllTest.php @@ -1,7 +1,7 @@ operation = new Zend_Test_PHPUnit_Db_Operation_DeleteAll(); } diff --git a/tests/Zend/Test/PHPUnit/Db/Operation/InsertTest.php b/tests/Zend/Test/PHPUnit/Db/Operation/InsertTest.php index 3293cd493d..d16db0101e 100644 --- a/tests/Zend/Test/PHPUnit/Db/Operation/InsertTest.php +++ b/tests/Zend/Test/PHPUnit/Db/Operation/InsertTest.php @@ -1,7 +1,7 @@ operation = new Zend_Test_PHPUnit_Db_Operation_Insert(); } diff --git a/tests/Zend/Test/PHPUnit/Db/Operation/TruncateTest.php b/tests/Zend/Test/PHPUnit/Db/Operation/TruncateTest.php index 0771123f04..a95663558b 100644 --- a/tests/Zend/Test/PHPUnit/Db/Operation/TruncateTest.php +++ b/tests/Zend/Test/PHPUnit/Db/Operation/TruncateTest.php @@ -1,7 +1,7 @@ operation = new Zend_Test_PHPUnit_Db_Operation_Truncate(); } diff --git a/tests/Zend/Test/PHPUnit/Db/SimpleTesterTest.php b/tests/Zend/Test/PHPUnit/Db/SimpleTesterTest.php index 261ecfe386..5bc3891e21 100644 --- a/tests/Zend/Test/PHPUnit/Db/SimpleTesterTest.php +++ b/tests/Zend/Test/PHPUnit/Db/SimpleTesterTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -59,6 +59,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Text_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Text_AllTests::main') { Zend_Text_AllTests::main(); } diff --git a/tests/Zend/Text/FigletTest.php b/tests/Zend/Text/FigletTest.php index 46f7c1b2dd..9ddd90ca24 100644 --- a/tests/Zend/Text/FigletTest.php +++ b/tests/Zend/Text/FigletTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testStandardAlignLeft() @@ -295,6 +295,6 @@ protected function _equalAgainstFile($output, $file) } // Call Zend_Text_FigletTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Text_FigletTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Text_FigletTest::main") { Zend_Text_FigletTest::main(); } diff --git a/tests/Zend/Text/MultiByteTest.php b/tests/Zend/Text/MultiByteTest.php index 04205ddf48..2cecd2d243 100644 --- a/tests/Zend/Text/MultiByteTest.php +++ b/tests/Zend/Text/MultiByteTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -298,6 +298,6 @@ public function testPadNegativePadLength() } // Call Zend_Text_MultiByteTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Text_MultiByteTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Text_MultiByteTest::main") { Zend_Text_MultiByteTest::main(); } diff --git a/tests/Zend/Text/TableTest.php b/tests/Zend/Text/TableTest.php index c3bca84044..3013c25dcd 100644 --- a/tests/Zend/Text/TableTest.php +++ b/tests/Zend/Text/TableTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function tearDown(): void + protected function tear_down() { Zend_Text_Table::setInputCharset('utf-8'); Zend_Text_Table::setOutputCharset('utf-8'); @@ -503,6 +503,6 @@ public function testDecoratorAscii() } // Call Zend_Text_TableTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Text_TableTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Text_TableTest::main") { Zend_Text_TableTest::main(); } diff --git a/tests/Zend/TimeSyncTest.php b/tests/Zend/TimeSyncTest.php index 9de190592d..8b5fec4d14 100644 --- a/tests/Zend/TimeSyncTest.php +++ b/tests/Zend/TimeSyncTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Tool_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tool_AllTests::main') { Zend_Tool_AllTests::main(); } diff --git a/tests/Zend/Tool/Framework/Action/BaseTest.php b/tests/Zend/Tool/Framework/Action/BaseTest.php index b9fc2f9aa5..a1caaadf5f 100644 --- a/tests/Zend/Tool/Framework/Action/BaseTest.php +++ b/tests/Zend/Tool/Framework/Action/BaseTest.php @@ -1,6 +1,6 @@ _repository = new Zend_Tool_Framework_Action_Repository(); } - protected function tearDown(): void + protected function tear_down() { $this->_repository = null; } diff --git a/tests/Zend/Tool/Framework/AllTests.php b/tests/Zend/Tool/Framework/AllTests.php index f58a491a6f..6788d9d832 100644 --- a/tests/Zend/Tool/Framework/AllTests.php +++ b/tests/Zend/Tool/Framework/AllTests.php @@ -54,7 +54,7 @@ class Zend_Tool_Framework_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -79,6 +79,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Tool_Framework_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tool_Framework_AllTests::main') { Zend_Tool_Framework_AllTests::main(); } diff --git a/tests/Zend/Tool/Framework/Client/RequestTest.php b/tests/Zend/Tool/Framework/Client/RequestTest.php index 79d29d4ffd..e62dadade7 100644 --- a/tests/Zend/Tool/Framework/Client/RequestTest.php +++ b/tests/Zend/Tool/Framework/Client/RequestTest.php @@ -1,6 +1,6 @@ _request = new Zend_Tool_Framework_Client_Request(); } diff --git a/tests/Zend/Tool/Framework/Client/ResponseTest.php b/tests/Zend/Tool/Framework/Client/ResponseTest.php index 5ed93bdf0c..8ad198a69b 100644 --- a/tests/Zend/Tool/Framework/Client/ResponseTest.php +++ b/tests/Zend/Tool/Framework/Client/ResponseTest.php @@ -1,6 +1,6 @@ _response = new Zend_Tool_Framework_Client_Response(); } diff --git a/tests/Zend/Tool/Framework/Loader/IncludePathLoaderTest.php b/tests/Zend/Tool/Framework/Loader/IncludePathLoaderTest.php index a556b76cfc..3d7d983542 100644 --- a/tests/Zend/Tool/Framework/Loader/IncludePathLoaderTest.php +++ b/tests/Zend/Tool/Framework/Loader/IncludePathLoaderTest.php @@ -1,6 +1,6 @@ _metadata = new Zend_Tool_Framework_Manifest_ProviderMetadata(); } - protected function tearDown(): void + protected function tear_down() { $this->_metadata = null; } diff --git a/tests/Zend/Tool/Framework/Manifest/RepositoryTest.php b/tests/Zend/Tool/Framework/Manifest/RepositoryTest.php index 6e423519f8..551d20fdf4 100644 --- a/tests/Zend/Tool/Framework/Manifest/RepositoryTest.php +++ b/tests/Zend/Tool/Framework/Manifest/RepositoryTest.php @@ -1,6 +1,6 @@ _repository = new Zend_Tool_Framework_Manifest_Repository(); @@ -72,7 +72,7 @@ protected function setUp(): void $this->_registry->setManifestRepository($this->_repository); } - protected function tearDown(): void + protected function tear_down() { $this->_registry->reset(); $this->_repository = null; diff --git a/tests/Zend/Tool/Framework/Metadata/ActionMetadataTest.php b/tests/Zend/Tool/Framework/Metadata/ActionMetadataTest.php index 9b09efbf82..5d0b52759a 100644 --- a/tests/Zend/Tool/Framework/Metadata/ActionMetadataTest.php +++ b/tests/Zend/Tool/Framework/Metadata/ActionMetadataTest.php @@ -1,6 +1,6 @@ _metadata = new Zend_Tool_Framework_Manifest_ActionMetadata(); } - protected function tearDown(): void + protected function tear_down() { $this->_metadata = null; } diff --git a/tests/Zend/Tool/Framework/Metadata/MetadataTest.php b/tests/Zend/Tool/Framework/Metadata/MetadataTest.php index 963a04f183..db5aa29dcf 100644 --- a/tests/Zend/Tool/Framework/Metadata/MetadataTest.php +++ b/tests/Zend/Tool/Framework/Metadata/MetadataTest.php @@ -1,6 +1,6 @@ _metadata = new Zend_Tool_Framework_Manifest_Metadata(); } - protected function tearDown(): void + protected function tear_down() { $this->_metadata = null; } diff --git a/tests/Zend/Tool/Framework/Provider/AbstractTest.php b/tests/Zend/Tool/Framework/Provider/AbstractTest.php index e33a4e32d9..4f7b3d9319 100644 --- a/tests/Zend/Tool/Framework/Provider/AbstractTest.php +++ b/tests/Zend/Tool/Framework/Provider/AbstractTest.php @@ -1,6 +1,6 @@ _request = new Zend_Tool_Framework_Client_Request(); $this->_response = new Zend_Tool_Framework_Client_Response(); diff --git a/tests/Zend/Tool/Framework/Provider/RepositoryTest.php b/tests/Zend/Tool/Framework/Provider/RepositoryTest.php index cc733add6f..93a482bd49 100644 --- a/tests/Zend/Tool/Framework/Provider/RepositoryTest.php +++ b/tests/Zend/Tool/Framework/Provider/RepositoryTest.php @@ -1,6 +1,6 @@ _repository = new Zend_Tool_Framework_Provider_Repository(); @@ -66,7 +66,7 @@ protected function setUp(): void $this->_registry->setActionRepository(new Zend_Tool_Framework_Action_Repository()); } - protected function tearDown(): void + protected function tear_down() { $this->_registry->reset(); $this->_repository = null; diff --git a/tests/Zend/Tool/Framework/Provider/SignatureTest.php b/tests/Zend/Tool/Framework/Provider/SignatureTest.php index 48af0a0ca3..94a89b62f3 100644 --- a/tests/Zend/Tool/Framework/Provider/SignatureTest.php +++ b/tests/Zend/Tool/Framework/Provider/SignatureTest.php @@ -1,6 +1,6 @@ _registry = new Zend_Tool_Framework_Registry(); @@ -68,7 +68,7 @@ protected function setUp(): void $this->_targetSignature->process(); } - protected function tearDown(): void + protected function tear_down() { $this->_registry->reset(); } diff --git a/tests/Zend/Tool/Framework/RegistryTest.php b/tests/Zend/Tool/Framework/RegistryTest.php index 69bc78c7cf..83ada0bd47 100644 --- a/tests/Zend/Tool/Framework/RegistryTest.php +++ b/tests/Zend/Tool/Framework/RegistryTest.php @@ -1,6 +1,6 @@ _registry = new Zend_Tool_Framework_Registry(); } - protected function tearDown(): void + protected function tear_down() { $this->_registry->reset(); } diff --git a/tests/Zend/Tool/Project/AllTests.php b/tests/Zend/Tool/Project/AllTests.php index 2222011c71..bc1c543666 100644 --- a/tests/Zend/Tool/Project/AllTests.php +++ b/tests/Zend/Tool/Project/AllTests.php @@ -44,7 +44,7 @@ class Zend_Tool_Project_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -58,6 +58,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Tool_Project_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Tool_Project_AllTests::main') { Zend_Tool_Project_AllTests::main(); } diff --git a/tests/Zend/Tool/Project/Context/RegistryTest.php b/tests/Zend/Tool/Project/Context/RegistryTest.php index b9a736070b..1d27b6ddcf 100644 --- a/tests/Zend/Tool/Project/Context/RegistryTest.php +++ b/tests/Zend/Tool/Project/Context/RegistryTest.php @@ -1,6 +1,6 @@ _projectDirectory = dirname(__FILE__) . '/_files/project1/'; $this->_projectProfileFile = dirname(__FILE__) . '/_files/.zfproject.xml.orig'; @@ -63,7 +63,7 @@ protected function setUp(): void $this->_standardProfileFromData->setAttribute('projectDirectory', $this->_projectDirectory); } - protected function tearDown(): void + protected function tear_down() { $this->_removeProjectFiles(); } diff --git a/tests/Zend/Tool/Project/Provider/ControllerTest.php b/tests/Zend/Tool/Project/Provider/ControllerTest.php index 0c5f22a5b9..7fc36fc28f 100644 --- a/tests/Zend/Tool/Project/Provider/ControllerTest.php +++ b/tests/Zend/Tool/Project/Provider/ControllerTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -71,6 +71,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Translate_Adapter_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Translate_Adapter_AllTests::main') { Zend_Translate_Adapter_AllTests::main(); } diff --git a/tests/Zend/Translate/Adapter/ArrayTest.php b/tests/Zend/Translate/Adapter/ArrayTest.php index ea10a318be..10d5537b00 100644 --- a/tests/Zend/Translate/Adapter/ArrayTest.php +++ b/tests/Zend/Translate/Adapter/ArrayTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (Zend_Translate_Adapter_Array::hasCache()) { Zend_Translate_Adapter_Array::clearCache(); @@ -70,7 +70,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { if (Zend_Translate_Adapter_Array::hasCache()) { Zend_Translate_Adapter_Array::clearCache(); @@ -359,6 +359,6 @@ public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $e } // Call Zend_Translate_Adapter_ArrayTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Translate_Adapter_ArrayTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Translate_Adapter_ArrayTest::main") { Zend_Translate_Adapter_ArrayTest::main(); } diff --git a/tests/Zend/Translate/Adapter/CsvTest.php b/tests/Zend/Translate/Adapter/CsvTest.php index f512be9cc8..24449767a4 100644 --- a/tests/Zend/Translate/Adapter/CsvTest.php +++ b/tests/Zend/Translate/Adapter/CsvTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (Zend_Translate_Adapter_Csv::hasCache()) { Zend_Translate_Adapter_Csv::removeCache(); @@ -252,6 +252,6 @@ public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $e } // Call Zend_Translate_Adapter_CsvTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Translate_Adapter_CsvTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Translate_Adapter_CsvTest::main") { Zend_Translate_Adapter_CsvTest::main(); } diff --git a/tests/Zend/Translate/Adapter/GettextTest.php b/tests/Zend/Translate/Adapter/GettextTest.php index b5b1248476..4b3a93bf2a 100644 --- a/tests/Zend/Translate/Adapter/GettextTest.php +++ b/tests/Zend/Translate/Adapter/GettextTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); Zend_Translate_Adapter_Gettext::removeCache(); } - protected function setUp(): void + protected function set_up() { if (Zend_Translate_Adapter_Gettext::hasCache()) { Zend_Translate_Adapter_Gettext::removeCache(); @@ -329,6 +329,6 @@ public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $e } // Call Zend_Translate_Adapter_GettextTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Translate_Adapter_GettextTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Translate_Adapter_GettextTest::main") { Zend_Translate_GettextTest::main(); } diff --git a/tests/Zend/Translate/Adapter/IniTest.php b/tests/Zend/Translate/Adapter/IniTest.php index 57735682a9..5f978797ba 100644 --- a/tests/Zend/Translate/Adapter/IniTest.php +++ b/tests/Zend/Translate/Adapter/IniTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testCreate() @@ -228,6 +228,6 @@ public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $e } // Call Zend_Translate_Adapter_IniTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Translate_Adapter_IniTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Translate_Adapter_IniTest::main") { Zend_Translate_Adapter_IniTest::main(); } diff --git a/tests/Zend/Translate/Adapter/QtTest.php b/tests/Zend/Translate/Adapter/QtTest.php index 3ae40d424f..22fabe5236 100644 --- a/tests/Zend/Translate/Adapter/QtTest.php +++ b/tests/Zend/Translate/Adapter/QtTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testCreate() @@ -255,6 +255,6 @@ public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $e } // Call Zend_Translate_Adapter_QtTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Translate_Adapter_QtTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Translate_Adapter_QtTest::main") { Zend_Translate_Adapter_QtTest::main(); } diff --git a/tests/Zend/Translate/Adapter/TbxTest.php b/tests/Zend/Translate/Adapter/TbxTest.php index 7f742e0b55..3ebb89fab6 100644 --- a/tests/Zend/Translate/Adapter/TbxTest.php +++ b/tests/Zend/Translate/Adapter/TbxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testCreate() @@ -261,6 +261,6 @@ public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $e } // Call Zend_Translate_Adapter_TbxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Translate_Adapter_TbxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Translate_Adapter_TbxTest::main") { Zend_Translate_Adapter_TbxTest::main(); } diff --git a/tests/Zend/Translate/Adapter/TmxTest.php b/tests/Zend/Translate/Adapter/TmxTest.php index 4feff90ee0..64dcd8d9a6 100644 --- a/tests/Zend/Translate/Adapter/TmxTest.php +++ b/tests/Zend/Translate/Adapter/TmxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testCreate() @@ -287,6 +287,6 @@ public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $e } // Call Zend_Translate_Adapter_TmxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Translate_Adapter_TmxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Translate_Adapter_TmxTest::main") { Zend_Translate_Adapter_TmxTest::main(); } diff --git a/tests/Zend/Translate/Adapter/XliffTest.php b/tests/Zend/Translate/Adapter/XliffTest.php index 5069b48a8b..e7cfc8ba3d 100644 --- a/tests/Zend/Translate/Adapter/XliffTest.php +++ b/tests/Zend/Translate/Adapter/XliffTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testCreate() @@ -255,6 +255,6 @@ public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $e } // Call Zend_Translate_Adapter_XliffTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Translate_Adapter_XliffTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Translate_Adapter_XliffTest::main") { Zend_Translate_Adapter_XliffTest::main(); } diff --git a/tests/Zend/Translate/Adapter/XmlTmTest.php b/tests/Zend/Translate/Adapter/XmlTmTest.php index 7048685926..c7a207b7e2 100644 --- a/tests/Zend/Translate/Adapter/XmlTmTest.php +++ b/tests/Zend/Translate/Adapter/XmlTmTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testCreate() @@ -263,6 +263,6 @@ public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $e } // Call Zend_Translate_Adapter_XmlTmTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Translate_Adapter_XmlTmTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Translate_Adapter_XmlTmTest::main") { Zend_Translate_Adapter_XmlTmTest::main(); } diff --git a/tests/Zend/Translate/AllTests.php b/tests/Zend/Translate/AllTests.php index cee1c47b2b..b3fa8102a8 100644 --- a/tests/Zend/Translate/AllTests.php +++ b/tests/Zend/Translate/AllTests.php @@ -42,7 +42,7 @@ class Zend_Translate_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Translate_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Translate_AllTests::main') { Zend_Translate_AllTests::main(); } diff --git a/tests/Zend/TranslateTest.php b/tests/Zend/TranslateTest.php index 5661b3e72e..b70c1b90cd 100644 --- a/tests/Zend/TranslateTest.php +++ b/tests/Zend/TranslateTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (Zend_Translate::hasCache()) { Zend_Translate::removeCache(); @@ -954,6 +954,6 @@ public function customPlural($number) } // Call Zend_TranslateTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_TranslateTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_TranslateTest::main") { Zend_TranslateTest::main(); } diff --git a/tests/Zend/Uri/AllTests.php b/tests/Zend/Uri/AllTests.php index 9573e3dd38..0d7a533182 100644 --- a/tests/Zend/Uri/AllTests.php +++ b/tests/Zend/Uri/AllTests.php @@ -47,7 +47,7 @@ class Zend_Uri_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -65,6 +65,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Uri_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Uri_AllTests::main') { Zend_Uri_AllTests::main(); } diff --git a/tests/Zend/Uri/HttpTest.php b/tests/Zend/Uri/HttpTest.php index 78723cad7b..2e72618322 100644 --- a/tests/Zend/Uri/HttpTest.php +++ b/tests/Zend/Uri/HttpTest.php @@ -1,6 +1,6 @@ false]); } diff --git a/tests/Zend/UriTest.php b/tests/Zend/UriTest.php index ef83cbec60..aa902bcd27 100644 --- a/tests/Zend/UriTest.php +++ b/tests/Zend/UriTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->notices = []; $this->errorReporting = error_reporting(); $this->displayErrors = ini_get('display_errors'); } - protected function tearDown(): void + protected function tear_down() { error_reporting($this->errorReporting); ini_set('display_errors', $this->displayErrors); @@ -268,6 +268,6 @@ class Fake_Zend_Uri } // Call Zend_UriTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_UriTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_UriTest::main") { Zend_UriTest::main(); } diff --git a/tests/Zend/Validate/AbstractTest.php b/tests/Zend/Validate/AbstractTest.php index 39ba951c39..b2d6efa5ba 100644 --- a/tests/Zend/Validate/AbstractTest.php +++ b/tests/Zend/Validate/AbstractTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function clearRegistry() @@ -82,14 +82,14 @@ public function clearRegistry() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->clearRegistry(); Zend_Validate_Abstract::setDefaultTranslator(null); $this->validator = new Zend_Validate_AbstractTest_Concrete(); } - protected function tearDown(): void + protected function tear_down() { $this->clearRegistry(); Zend_Validate_Abstract::setDefaultTranslator(null); @@ -327,6 +327,6 @@ public function isValid($value) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Validate_AbstractTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Validate_AbstractTest::main') { Zend_Validate_AbstractTest::main(); } diff --git a/tests/Zend/Validate/AllTests.php b/tests/Zend/Validate/AllTests.php index b930de99cb..5006d8bed0 100644 --- a/tests/Zend/Validate/AllTests.php +++ b/tests/Zend/Validate/AllTests.php @@ -76,7 +76,7 @@ class Zend_Validate_AllTests */ public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -123,6 +123,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Validate_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Validate_AllTests::main') { Zend_Validate_AllTests::main(); } diff --git a/tests/Zend/Validate/AlnumTest.php b/tests/Zend/Validate/AlnumTest.php index 1b25e379ad..310303c219 100644 --- a/tests/Zend/Validate/AlnumTest.php +++ b/tests/Zend/Validate/AlnumTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Alnum(); } diff --git a/tests/Zend/Validate/AlphaTest.php b/tests/Zend/Validate/AlphaTest.php index f85e8477ae..1590bdfd7e 100644 --- a/tests/Zend/Validate/AlphaTest.php +++ b/tests/Zend/Validate/AlphaTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Alpha(); } diff --git a/tests/Zend/Validate/BarcodeTest.php b/tests/Zend/Validate/BarcodeTest.php index 64ae71aacd..5d6753b5a6 100644 --- a/tests/Zend/Validate/BarcodeTest.php +++ b/tests/Zend/Validate/BarcodeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -131,6 +131,6 @@ public function optionsCallback($value) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Validate_CallbackTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Validate_CallbackTest::main') { Zend_Validate_CallbackTest::main(); } diff --git a/tests/Zend/Validate/CcnumTest.php b/tests/Zend/Validate/CcnumTest.php index 0a9f9a24f5..85887158a5 100644 --- a/tests/Zend/Validate/CcnumTest.php +++ b/tests/Zend/Validate/CcnumTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Ccnum(); } - protected function tearDown(): void + protected function tear_down() { restore_error_handler(); } diff --git a/tests/Zend/Validate/CreditCardTest.php b/tests/Zend/Validate/CreditCardTest.php index 920b3f7e03..b93bd2023d 100644 --- a/tests/Zend/Validate/CreditCardTest.php +++ b/tests/Zend/Validate/CreditCardTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Date(); } diff --git a/tests/Zend/Validate/Db/AllTests.php b/tests/Zend/Validate/Db/AllTests.php index 34c9cafa21..c74db04dee 100644 --- a/tests/Zend/Validate/Db/AllTests.php +++ b/tests/Zend/Validate/Db/AllTests.php @@ -43,7 +43,7 @@ class Zend_Validate_Db_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Validate_Db_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Validate_Db_AllTests::main') { Zend_Validate_Db_AllTests::main(); } diff --git a/tests/Zend/Validate/Db/NoRecordExistsTest.php b/tests/Zend/Validate/Db/NoRecordExistsTest.php index 13a8ee3b67..72f935468c 100644 --- a/tests/Zend/Validate/Db/NoRecordExistsTest.php +++ b/tests/Zend/Validate/Db/NoRecordExistsTest.php @@ -1,6 +1,6 @@ _adapterHasResult = new Db_MockHasResult(); $this->_adapterNoResult = new Db_MockNoResult(); diff --git a/tests/Zend/Validate/Db/RecordExistsTest.php b/tests/Zend/Validate/Db/RecordExistsTest.php index 8223ff7ad4..bc19cfd9ff 100644 --- a/tests/Zend/Validate/Db/RecordExistsTest.php +++ b/tests/Zend/Validate/Db/RecordExistsTest.php @@ -1,6 +1,6 @@ _adapterHasResult = new Db_MockHasResult(); $this->_adapterNoResult = new Db_MockNoResult(); diff --git a/tests/Zend/Validate/DigitsTest.php b/tests/Zend/Validate/DigitsTest.php index 09413e3d14..77c6b8e3b6 100644 --- a/tests/Zend/Validate/DigitsTest.php +++ b/tests/Zend/Validate/DigitsTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Digits(); } diff --git a/tests/Zend/Validate/EmailAddressTest.php b/tests/Zend/Validate/EmailAddressTest.php index 241fb7a009..6bd387964b 100644 --- a/tests/Zend/Validate/EmailAddressTest.php +++ b/tests/Zend/Validate/EmailAddressTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -72,7 +72,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->_validator = new Zend_Validate_EmailAddress(); } @@ -658,6 +658,6 @@ public function testNonReservedIp() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Validate_EmailAddressTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Validate_EmailAddressTest::main') { Zend_Validate_EmailAddressTest::main(); } diff --git a/tests/Zend/Validate/File/AllTests.php b/tests/Zend/Validate/File/AllTests.php index bff7cb214e..dca99c999b 100644 --- a/tests/Zend/Validate/File/AllTests.php +++ b/tests/Zend/Validate/File/AllTests.php @@ -60,7 +60,7 @@ class Zend_Validate_File_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -90,6 +90,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Validate_File_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Validate_File_AllTests::main') { Zend_Validate_File_AllTests::main(); } diff --git a/tests/Zend/Validate/File/CountTest.php b/tests/Zend/Validate/File/CountTest.php index 0dc2800295..6c975e4dff 100644 --- a/tests/Zend/Validate/File/CountTest.php +++ b/tests/Zend/Validate/File/CountTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -178,6 +178,6 @@ public function testSetMax() } // Call Zend_Validate_File_CountTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_CountTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_CountTest::main") { Zend_Validate_File_CountTest::main(); } diff --git a/tests/Zend/Validate/File/Crc32Test.php b/tests/Zend/Validate/File/Crc32Test.php index bbc7a9143c..5a1c46b700 100644 --- a/tests/Zend/Validate/File/Crc32Test.php +++ b/tests/Zend/Validate/File/Crc32Test.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -208,6 +208,6 @@ public function testAddHash() } // Call Zend_Validate_File_Crc32Test::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_Crc32Test::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_Crc32Test::main") { Zend_Validate_File_Crc32Test::main(); } diff --git a/tests/Zend/Validate/File/ExcludeExtensionTest.php b/tests/Zend/Validate/File/ExcludeExtensionTest.php index 88766a3dcb..ee29d29ea1 100644 --- a/tests/Zend/Validate/File/ExcludeExtensionTest.php +++ b/tests/Zend/Validate/File/ExcludeExtensionTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -191,6 +191,6 @@ public function testAddExtension() } // Call Zend_Validate_File_ExcludeExtensionTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_ExcludeExtensionTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_ExcludeExtensionTest::main") { Zend_Validate_File_ExtensionTest::main(); } diff --git a/tests/Zend/Validate/File/ExcludeMimeTypeTest.php b/tests/Zend/Validate/File/ExcludeMimeTypeTest.php index 1084498647..5a0c3b6c8c 100644 --- a/tests/Zend/Validate/File/ExcludeMimeTypeTest.php +++ b/tests/Zend/Validate/File/ExcludeMimeTypeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -176,6 +176,6 @@ public function testShouldHaveProperErrorMessageOnNotReadableFile() } // Call Zend_Validate_File_ExcludeMimeTypeTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_ExcludeMimeTypeTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_ExcludeMimeTypeTest::main") { Zend_Validate_File_ExcludeMimeTypeTest::main(); } diff --git a/tests/Zend/Validate/File/ExistsTest.php b/tests/Zend/Validate/File/ExistsTest.php index 23fea0e220..464a7830ab 100644 --- a/tests/Zend/Validate/File/ExistsTest.php +++ b/tests/Zend/Validate/File/ExistsTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -206,6 +206,6 @@ public function testAddDirectory() } // Call Zend_Validate_File_ExistsTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_ExistsTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_ExistsTest::main") { Zend_Validate_File_ExistsTest::main(); } diff --git a/tests/Zend/Validate/File/ExtensionTest.php b/tests/Zend/Validate/File/ExtensionTest.php index ffe93fb1fc..18bf71eb16 100644 --- a/tests/Zend/Validate/File/ExtensionTest.php +++ b/tests/Zend/Validate/File/ExtensionTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -212,6 +212,6 @@ public function testAddExtension() } // Call Zend_Validate_File_ExtensionTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_ExtensionTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_ExtensionTest::main") { Zend_Validate_File_ExtensionTest::main(); } diff --git a/tests/Zend/Validate/File/FilesSizeTest.php b/tests/Zend/Validate/File/FilesSizeTest.php index 096e5120fe..139bc453a5 100644 --- a/tests/Zend/Validate/File/FilesSizeTest.php +++ b/tests/Zend/Validate/File/FilesSizeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->multipleOptionsDetected = false; } @@ -237,6 +237,6 @@ public function errorHandler($errno, $errstr) } // Call Zend_Validate_File_FilesSizeTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_FilesSizeTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_FilesSizeTest::main") { Zend_Validate_File_FilesSizeTest::main(); } diff --git a/tests/Zend/Validate/File/HashTest.php b/tests/Zend/Validate/File/HashTest.php index b9a53cf99c..07810aad76 100644 --- a/tests/Zend/Validate/File/HashTest.php +++ b/tests/Zend/Validate/File/HashTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -180,6 +180,6 @@ public function testAddHash() } // Call Zend_Validate_File_HashTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_HashTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_HashTest::main") { Zend_Validate_File_HashTest::main(); } diff --git a/tests/Zend/Validate/File/ImageSizeTest.php b/tests/Zend/Validate/File/ImageSizeTest.php index 5622791a89..4038ed8ad1 100644 --- a/tests/Zend/Validate/File/ImageSizeTest.php +++ b/tests/Zend/Validate/File/ImageSizeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** diff --git a/tests/Zend/Validate/File/IsCompressedTest.php b/tests/Zend/Validate/File/IsCompressedTest.php index e0edc6a5c1..ebce2972f5 100644 --- a/tests/Zend/Validate/File/IsCompressedTest.php +++ b/tests/Zend/Validate/File/IsCompressedTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -224,6 +224,6 @@ public function testOptionsAtConstructor() } // Call Zend_Validate_File_MimeTypeTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_IsCompressedTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_IsCompressedTest::main") { Zend_Validate_File_IsCompressedTest::main(); } diff --git a/tests/Zend/Validate/File/IsImageTest.php b/tests/Zend/Validate/File/IsImageTest.php index 5085506b7f..6f7fb031cc 100644 --- a/tests/Zend/Validate/File/IsImageTest.php +++ b/tests/Zend/Validate/File/IsImageTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -202,6 +202,6 @@ public function testOptionsAtConstructor() } // Call Zend_Validate_File_IsImage::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_IsImage::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_IsImage::main") { Zend_Validate_File_IsImage::main(); } diff --git a/tests/Zend/Validate/File/Md5Test.php b/tests/Zend/Validate/File/Md5Test.php index 2c39ca6b42..fc272cdccf 100644 --- a/tests/Zend/Validate/File/Md5Test.php +++ b/tests/Zend/Validate/File/Md5Test.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -208,6 +208,6 @@ public function testAddHash() } // Call Zend_Validate_File_Md5Test::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_Md5Test::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_Md5Test::main") { Zend_Validate_File_Md5Test::main(); } diff --git a/tests/Zend/Validate/File/MimeTypeTest.php b/tests/Zend/Validate/File/MimeTypeTest.php index 5d47ae49d6..383138a587 100644 --- a/tests/Zend/Validate/File/MimeTypeTest.php +++ b/tests/Zend/Validate/File/MimeTypeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -269,6 +269,10 @@ public function testDisablingTryCommonMagicFilesIgnoresCommonLocations() $this->markTestSkipped('Behavior is only applicable and testable for PHP 5.3+'); } + if (version_compare(PHP_VERSION, '7.1.0', '>=')) { + $this->markTestSkipped('Behavior is only applicable and testable for PHP 5.3+'); + } + $filetest = dirname(__FILE__) . '/_files/picture.jpg'; $files = [ 'name' => 'picture.jpg', @@ -293,13 +297,13 @@ public function testDisablingTryCommonMagicFilesIgnoresCommonLocations() // as well as Zend_Validate_File_IsCompressedTest::testBasic and Zend_Validate_File_IsImageTest::testBasic // will be failing as well. $validator = new Zend_Validate_File_MimeType(['image/jpeg', 'image/jpeg; charset=binary']); - $validator->setTryCommonMagicFilesFlag(false); + $validator->setMagicFile(false); $this->assertTrue($validator->isValid($filetest, $files)); } } } // Call Zend_Validate_File_MimeTypeTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_MimeTypeTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_MimeTypeTest::main") { Zend_Validate_File_MimeTypeTest::main(); } diff --git a/tests/Zend/Validate/File/NotExistsTest.php b/tests/Zend/Validate/File/NotExistsTest.php index 4df2bd3872..0ed43f22a0 100644 --- a/tests/Zend/Validate/File/NotExistsTest.php +++ b/tests/Zend/Validate/File/NotExistsTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -206,6 +206,6 @@ public function testAddDirectory() } // Call Zend_Validate_File_NotExistsTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_NotExistsTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_NotExistsTest::main") { Zend_Validate_File_NotExistsTest::main(); } diff --git a/tests/Zend/Validate/File/Sha1Test.php b/tests/Zend/Validate/File/Sha1Test.php index 6ae6a6750e..77c6dfc1df 100644 --- a/tests/Zend/Validate/File/Sha1Test.php +++ b/tests/Zend/Validate/File/Sha1Test.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -208,6 +208,6 @@ public function testAddHash() } // Call Zend_Validate_File_Sha1Test::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_Sha1Test::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_Sha1Test::main") { Zend_Validate_File_Sha1Test::main(); } diff --git a/tests/Zend/Validate/File/SizeTest.php b/tests/Zend/Validate/File/SizeTest.php index bcc203e837..a66c171e39 100644 --- a/tests/Zend/Validate/File/SizeTest.php +++ b/tests/Zend/Validate/File/SizeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -219,6 +219,6 @@ public function testFailureMessage() } // Call Zend_Validate_File_SizeTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_SizeTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_SizeTest::main") { Zend_Validate_File_SizeTest::main(); } diff --git a/tests/Zend/Validate/File/UploadTest.php b/tests/Zend/Validate/File/UploadTest.php index 9c31acf73f..8fcf0857e7 100644 --- a/tests/Zend/Validate/File/UploadTest.php +++ b/tests/Zend/Validate/File/UploadTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -307,6 +307,6 @@ public function testErrorMessage() } // Call Zend_Validate_File_UploadTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_UploadTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_UploadTest::main") { Zend_Validate_File_UploadTest::main(); } diff --git a/tests/Zend/Validate/File/WordCountTest.php b/tests/Zend/Validate/File/WordCountTest.php index 086c380009..e28d95222e 100644 --- a/tests/Zend/Validate/File/WordCountTest.php +++ b/tests/Zend/Validate/File/WordCountTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -162,6 +162,6 @@ public function testSetMax() } // Call Zend_Validate_File_WordCountTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_File_WordCountTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_File_WordCountTest::main") { Zend_Validate_File_WordCountTest::main(); } diff --git a/tests/Zend/Validate/FloatTest.php b/tests/Zend/Validate/FloatTest.php index aa1303a1cf..d97cf05250 100644 --- a/tests/Zend/Validate/FloatTest.php +++ b/tests/Zend/Validate/FloatTest.php @@ -1,6 +1,6 @@ _locale = setlocale(LC_ALL, 0); //backup locale @@ -67,7 +67,7 @@ protected function setUp(): void $this->_validator = new Zend_Validate_Float(); } - protected function tearDown(): void + protected function tear_down() { //restore locale if (is_string($this->_locale) && strpos($this->_locale, ';')) { diff --git a/tests/Zend/Validate/GreaterThanTest.php b/tests/Zend/Validate/GreaterThanTest.php index 59507f37e2..6fdd447589 100644 --- a/tests/Zend/Validate/GreaterThanTest.php +++ b/tests/Zend/Validate/GreaterThanTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Hex(); } diff --git a/tests/Zend/Validate/HostnameTest.php b/tests/Zend/Validate/HostnameTest.php index b7a7656eb0..d300f8ff59 100644 --- a/tests/Zend/Validate/HostnameTest.php +++ b/tests/Zend/Validate/HostnameTest.php @@ -1,6 +1,6 @@ _origEncoding = PHP_VERSION_ID < 50600 ? iconv_get_encoding('internal_encoding') @@ -67,7 +67,7 @@ protected function setUp(): void /** * Reset iconv */ - protected function tearDown(): void + protected function tear_down() { if (PHP_VERSION_ID < 50600) { iconv_set_encoding('internal_encoding', $this->_origEncoding); diff --git a/tests/Zend/Validate/IbanTest.php b/tests/Zend/Validate/IbanTest.php index 7a84134f28..39cde17500 100644 --- a/tests/Zend/Validate/IbanTest.php +++ b/tests/Zend/Validate/IbanTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->validator = new Zend_Validate_Identical(); } @@ -152,6 +152,6 @@ public function testValidatingNonStrictToken() } // Call Zend_Validate_IdenticalTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == 'Zend_Validate_IdenticalTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Validate_IdenticalTest::main') { Zend_Validate_IdenticalTest::main(); } diff --git a/tests/Zend/Validate/InArrayTest.php b/tests/Zend/Validate/InArrayTest.php index 49b7e1e888..3399df5b0f 100644 --- a/tests/Zend/Validate/InArrayTest.php +++ b/tests/Zend/Validate/InArrayTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Int(); } diff --git a/tests/Zend/Validate/IpTest.php b/tests/Zend/Validate/IpTest.php index d6303bd7ea..a45795d9f5 100644 --- a/tests/Zend/Validate/IpTest.php +++ b/tests/Zend/Validate/IpTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Ip(); } diff --git a/tests/Zend/Validate/IsbnTest.php b/tests/Zend/Validate/IsbnTest.php index 512e8e7689..a5c614f00f 100644 --- a/tests/Zend/Validate/IsbnTest.php +++ b/tests/Zend/Validate/IsbnTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -64,7 +64,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->_validator = new Zend_Validate_StringLength(4, 8); } @@ -320,6 +320,6 @@ public function testGetMessageVariables() } // Call Zend_Validate_MessageTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == 'Zend_Validate_MessageTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Validate_MessageTest::main') { Zend_Validate_MessageTest::main(); } diff --git a/tests/Zend/Validate/NotEmptyTest.php b/tests/Zend/Validate/NotEmptyTest.php index 24e25f276b..903c04ab6a 100644 --- a/tests/Zend/Validate/NotEmptyTest.php +++ b/tests/Zend/Validate/NotEmptyTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -69,7 +69,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->_validator = new Zend_Validate_NotEmpty(); } @@ -632,6 +632,6 @@ public function toString() } // Call Zend_Validate_NotEmptyTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_Validate_NotEmptyTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Validate_NotEmptyTest::main") { Zend_Validate_NotEmptyTest::main(); } diff --git a/tests/Zend/Validate/PostCodeTest.php b/tests/Zend/Validate/PostCodeTest.php index b4b99abf50..e97b88451e 100644 --- a/tests/Zend/Validate/PostCodeTest.php +++ b/tests/Zend/Validate/PostCodeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -67,7 +67,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->_validator = new Zend_Validate_PostCode('de_AT'); } @@ -189,6 +189,6 @@ public function testErrorMessageText() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Validate_PostCodeTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Validate_PostCodeTest::main') { Zend_Validate_PostCodeTest::main(); } diff --git a/tests/Zend/Validate/RegexTest.php b/tests/Zend/Validate/RegexTest.php index 9f42aa58ac..74756ed820 100644 --- a/tests/Zend/Validate/RegexTest.php +++ b/tests/Zend/Validate/RegexTest.php @@ -1,6 +1,6 @@ run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -62,6 +62,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Validate_Sitemap_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Validate_Sitemap_AllTests::main') { Zend_Validate_Sitemap_AllTests::main(); } diff --git a/tests/Zend/Validate/Sitemap/ChangefreqTest.php b/tests/Zend/Validate/Sitemap/ChangefreqTest.php index 60f12a4fa6..2b8116b48d 100644 --- a/tests/Zend/Validate/Sitemap/ChangefreqTest.php +++ b/tests/Zend/Validate/Sitemap/ChangefreqTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Sitemap_Changefreq(); } @@ -55,7 +55,7 @@ protected function setUp(): void /** * Cleans up the environment after running a test */ - protected function tearDown(): void + protected function tear_down() { $this->_validator = null; } diff --git a/tests/Zend/Validate/Sitemap/LastmodTest.php b/tests/Zend/Validate/Sitemap/LastmodTest.php index 2042d56d8f..4abe8504d4 100644 --- a/tests/Zend/Validate/Sitemap/LastmodTest.php +++ b/tests/Zend/Validate/Sitemap/LastmodTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Sitemap_Lastmod(); } @@ -55,7 +55,7 @@ protected function setUp(): void /** * Cleans up the environment after running a test */ - protected function tearDown(): void + protected function tear_down() { $this->_validator = null; } diff --git a/tests/Zend/Validate/Sitemap/LocTest.php b/tests/Zend/Validate/Sitemap/LocTest.php index d1378b91be..cac463bc35 100644 --- a/tests/Zend/Validate/Sitemap/LocTest.php +++ b/tests/Zend/Validate/Sitemap/LocTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Sitemap_Loc(); } @@ -55,7 +55,7 @@ protected function setUp(): void /** * Cleans up the environment after running a test */ - protected function tearDown(): void + protected function tear_down() { $this->_validator = null; } diff --git a/tests/Zend/Validate/Sitemap/PriorityTest.php b/tests/Zend/Validate/Sitemap/PriorityTest.php index db07c80ea8..60a36fc20d 100644 --- a/tests/Zend/Validate/Sitemap/PriorityTest.php +++ b/tests/Zend/Validate/Sitemap/PriorityTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_Sitemap_Priority(); } @@ -55,7 +55,7 @@ protected function setUp(): void /** * Cleans up the environment after running a test */ - protected function tearDown(): void + protected function tear_down() { $this->_validator = null; } diff --git a/tests/Zend/Validate/StringLengthTest.php b/tests/Zend/Validate/StringLengthTest.php index 44089442d0..01de828d45 100644 --- a/tests/Zend/Validate/StringLengthTest.php +++ b/tests/Zend/Validate/StringLengthTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate_StringLength(); } diff --git a/tests/Zend/ValidateTest.php b/tests/Zend/ValidateTest.php index d7cef6369d..fb6e7e360b 100644 --- a/tests/Zend/ValidateTest.php +++ b/tests/Zend/ValidateTest.php @@ -1,6 +1,6 @@ _validator = new Zend_Validate(); } @@ -80,7 +80,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { Zend_Validate::setDefaultNamespaces([]); } diff --git a/tests/Zend/VersionTest.php b/tests/Zend/VersionTest.php index b877dcce4e..f88b4c368e 100644 --- a/tests/Zend/VersionTest.php +++ b/tests/Zend/VersionTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -111,6 +111,6 @@ public function testFetchLatestVersion() } } -if (PHPUnit_MAIN_METHOD == "Zend_VersionTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_VersionTest::main") { Zend_VersionTest::main(); } diff --git a/tests/Zend/View/AllTests.php b/tests/Zend/View/AllTests.php index b28d8de8b1..9de578ee8d 100644 --- a/tests/Zend/View/AllTests.php +++ b/tests/Zend/View/AllTests.php @@ -42,7 +42,7 @@ class Zend_View_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_View_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_View_AllTests::main') { Zend_View_AllTests::main(); } diff --git a/tests/Zend/View/Helper/ActionTest.php b/tests/Zend/View/Helper/ActionTest.php index 563ae1ecbc..f01e7e3aa8 100644 --- a/tests/Zend/View/Helper/ActionTest.php +++ b/tests/Zend/View/Helper/ActionTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -100,7 +100,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->_origServer = $_SERVER; $_SERVER = [ @@ -129,7 +129,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->request, $this->response, $this->helper); $_SERVER = $this->_origServer; @@ -366,6 +366,6 @@ public function testActionCalledWithinActionResetsResponseState() } // Call Zend_View_Helper_ActionTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_ActionTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_ActionTest::main") { Zend_View_Helper_ActionTest::main(); } diff --git a/tests/Zend/View/Helper/AllTests.php b/tests/Zend/View/Helper/AllTests.php index c6f0c4cab4..961ecdee26 100644 --- a/tests/Zend/View/Helper/AllTests.php +++ b/tests/Zend/View/Helper/AllTests.php @@ -90,7 +90,7 @@ class Zend_View_Helper_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -150,6 +150,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_View_Helper_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_View_Helper_AllTests::main') { Zend_View_Helper_AllTests::main(); } diff --git a/tests/Zend/View/Helper/AttributeJsEscapingTest.php b/tests/Zend/View/Helper/AttributeJsEscapingTest.php index d239f089d0..e58c8e9b67 100644 --- a/tests/Zend/View/Helper/AttributeJsEscapingTest.php +++ b/tests/Zend/View/Helper/AttributeJsEscapingTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (Zend_Registry::isRegistered('Zend_View_Helper_Doctype')) { $registry = Zend_Registry::getInstance(); @@ -91,7 +91,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper, $this->view); } @@ -112,6 +112,6 @@ public function testRendersSubmitInput() } // Call Zend_View_Helper_FormSubmitTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormSubmitTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormSubmitTest::main") { Zend_View_Helper_FormSubmitTest::main(); } diff --git a/tests/Zend/View/Helper/BaseUrlTest.php b/tests/Zend/View/Helper/BaseUrlTest.php index 247b34832d..dc3acdaddb 100644 --- a/tests/Zend/View/Helper/BaseUrlTest.php +++ b/tests/Zend/View/Helper/BaseUrlTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** * Prepares the environment before running a test. */ - protected function setUp(): void + protected function set_up() { $this->_previousBaseUrl = Zend_Controller_Front::getInstance()->getBaseUrl(); $this->_server = $_SERVER; @@ -86,7 +86,7 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { Zend_Controller_Front::getInstance()->setBaseUrl($this->_previousBaseUrl); Zend_Controller_Front::getInstance()->resetInstance(); @@ -212,6 +212,6 @@ public function testGetBaseUrlReturnsBaseUrlWithoutScriptName() } // Call Zend_View_Helper_BaseUrlTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == 'Zend_View_Helper_BaseUrlTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_View_Helper_BaseUrlTest::main') { Zend_View_Helper_BaseUrlTest::main(); } diff --git a/tests/Zend/View/Helper/CurrencyTest.php b/tests/Zend/View/Helper/CurrencyTest.php index 8e59601ac6..6a1404ba2a 100644 --- a/tests/Zend/View/Helper/CurrencyTest.php +++ b/tests/Zend/View/Helper/CurrencyTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function clearRegistry() @@ -88,7 +88,7 @@ public function clearRegistry() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->clearRegistry(); require_once 'Zend/Cache.php'; @@ -109,7 +109,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); $this->_cache->clean(Zend_Cache::CLEANING_MODE_ALL); @@ -207,6 +207,6 @@ public function testHelperObjectReturnedWhenNoArgumentsPassed() } // Call Zend_View_Helper_TranslateTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_TranslateTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_TranslateTest::main") { Zend_View_Helper_TranslateTest::main(); } diff --git a/tests/Zend/View/Helper/CycleTest.php b/tests/Zend/View/Helper/CycleTest.php index 6bfd961b6d..93cc99e589 100644 --- a/tests/Zend/View/Helper/CycleTest.php +++ b/tests/Zend/View/Helper/CycleTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->helper = new Zend_View_Helper_Cycle(); } @@ -79,7 +79,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -167,6 +167,6 @@ public function testTwoCyclesInLoop() } } // Call Zend_View_Helper_CycleTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_CycleTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_CycleTest::main") { Zend_View_Helper_CycleTest::main(); } diff --git a/tests/Zend/View/Helper/DeclareVarsTest.php b/tests/Zend/View/Helper/DeclareVarsTest.php index 6bfc26bb2d..dfc4f235d2 100644 --- a/tests/Zend/View/Helper/DeclareVarsTest.php +++ b/tests/Zend/View/Helper/DeclareVarsTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $view = new Zend_View(); $base = str_replace('/', DIRECTORY_SEPARATOR, '/../_templates'); @@ -70,7 +70,7 @@ protected function setUp(): void $this->view = $view; } - protected function tearDown(): void + protected function tear_down() { unset($this->view); } @@ -121,6 +121,6 @@ public function testDeclareDeclaredVars() } // Call Zend_View_Helper_DeclareVarsTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_DeclareVarsTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_DeclareVarsTest::main") { Zend_View_Helper_DeclareVarsTest::main(); } diff --git a/tests/Zend/View/Helper/DoctypeTest.php b/tests/Zend/View/Helper/DoctypeTest.php index b51456ebb2..9f022eac1e 100644 --- a/tests/Zend/View/Helper/DoctypeTest.php +++ b/tests/Zend/View/Helper/DoctypeTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -76,7 +76,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $regKey = 'Zend_View_Helper_Doctype'; if (Zend_Registry::isRegistered($regKey)) { @@ -92,7 +92,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -228,6 +228,6 @@ public function testStringificationReturnsDoctypeString() } // Call Zend_View_Helper_DoctypeTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_DoctypeTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_DoctypeTest::main") { Zend_View_Helper_DoctypeTest::main(); } diff --git a/tests/Zend/View/Helper/FieldsetTest.php b/tests/Zend/View/Helper/FieldsetTest.php index f841c0e60d..07b99f2f02 100644 --- a/tests/Zend/View/Helper/FieldsetTest.php +++ b/tests/Zend/View/Helper/FieldsetTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,7 +73,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_Fieldset(); @@ -87,7 +87,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { ob_end_clean(); } @@ -128,6 +128,6 @@ public function testHelperShouldAllowDisablingEscapingOfLegend() } // Call Zend_View_Helper_FieldsetTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FieldsetTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FieldsetTest::main") { Zend_View_Helper_FieldsetTest::main(); } diff --git a/tests/Zend/View/Helper/FormButtonTest.php b/tests/Zend/View/Helper/FormButtonTest.php index c877417bb4..bf7b2f4e3d 100644 --- a/tests/Zend/View/Helper/FormButtonTest.php +++ b/tests/Zend/View/Helper/FormButtonTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_FormButton(); @@ -87,7 +87,7 @@ protected function setUp(): void * * @access protected */ - protected function tearDown(): void + protected function tear_down() { } @@ -148,6 +148,6 @@ public function testButtonTypeMayOnlyBeValidXhtmlButtonType() } // Call Zend_View_Helper_FormButtonTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormButtonTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormButtonTest::main") { Zend_View_Helper_FormButtonTest::main(); } diff --git a/tests/Zend/View/Helper/FormCheckboxTest.php b/tests/Zend/View/Helper/FormCheckboxTest.php index 89def421e8..cdeb1820bb 100644 --- a/tests/Zend/View/Helper/FormCheckboxTest.php +++ b/tests/Zend/View/Helper/FormCheckboxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { if (Zend_Registry::isRegistered('Zend_View_Helper_Doctype')) { $registry = Zend_Registry::getInstance(); @@ -361,6 +361,6 @@ public function testRenderingWithoutHiddenElement() } // Call Zend_View_Helper_FormCheckboxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormCheckboxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormCheckboxTest::main") { Zend_View_Helper_FormCheckboxTest::main(); } diff --git a/tests/Zend/View/Helper/FormErrorsTest.php b/tests/Zend/View/Helper/FormErrorsTest.php index 67c408ad33..6c9f9f8fff 100644 --- a/tests/Zend/View/Helper/FormErrorsTest.php +++ b/tests/Zend/View/Helper/FormErrorsTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,7 +73,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_FormErrors(); @@ -87,7 +87,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { ob_end_clean(); } @@ -207,6 +207,6 @@ public function testCanSetElementStringsPerOptions() } // Call Zend_View_Helper_FormErrorsTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormErrorsTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormErrorsTest::main") { Zend_View_Helper_FormErrorsTest::main(); } diff --git a/tests/Zend/View/Helper/FormFileTest.php b/tests/Zend/View/Helper/FormFileTest.php index 08c0870a1d..db4824edc7 100644 --- a/tests/Zend/View/Helper/FormFileTest.php +++ b/tests/Zend/View/Helper/FormFileTest.php @@ -1,6 +1,6 @@ run($suite); + (new resources_Runner())->run($suite); } /** @@ -77,7 +77,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { if (Zend_Registry::isRegistered('Zend_View_Helper_Doctype')) { $registry = Zend_Registry::getInstance(); @@ -152,6 +152,6 @@ public function testRendersCustomAttributes() } // Call Zend_View_Helper_FormFileTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormFileTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormFileTest::main") { Zend_View_Helper_FormFileTest::main(); } diff --git a/tests/Zend/View/Helper/FormImageTest.php b/tests/Zend/View/Helper/FormImageTest.php index 362644f484..d45fa1b793 100644 --- a/tests/Zend/View/Helper/FormImageTest.php +++ b/tests/Zend/View/Helper/FormImageTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->view->doctype('HTML4_LOOSE'); // Reset doctype to default @@ -89,7 +89,7 @@ protected function setUp(): void * * @access protected */ - protected function tearDown(): void + protected function tear_down() { } @@ -135,6 +135,6 @@ public function testCanRendersAsXHtml() } // Call Zend_View_Helper_FormImageTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormImageTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormImageTest::main") { Zend_View_Helper_FormImageTest::main(); } diff --git a/tests/Zend/View/Helper/FormLabelTest.php b/tests/Zend/View/Helper/FormLabelTest.php index 92181a59d5..7a0bcb230c 100644 --- a/tests/Zend/View/Helper/FormLabelTest.php +++ b/tests/Zend/View/Helper/FormLabelTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -75,7 +75,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_FormLabel(); @@ -88,7 +88,7 @@ protected function setUp(): void * * @access protected */ - protected function tearDown(): void + protected function tear_down() { } @@ -157,6 +157,6 @@ public function testShouldNotRenderDisableForAttributeIfForIsSuppressed() } // Call Zend_View_Helper_FormLabelTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormLabelTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormLabelTest::main") { Zend_View_Helper_FormLabelTest::main(); } diff --git a/tests/Zend/View/Helper/FormMultiCheckboxTest.php b/tests/Zend/View/Helper/FormMultiCheckboxTest.php index e5eb6599c1..8574b6a26d 100644 --- a/tests/Zend/View/Helper/FormMultiCheckboxTest.php +++ b/tests/Zend/View/Helper/FormMultiCheckboxTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (Zend_Registry::isRegistered('Zend_View_Helper_Doctype')) { $registry = Zend_Registry::getInstance(); @@ -92,7 +92,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { ob_end_clean(); } @@ -166,6 +166,6 @@ public function testCanRendersAsXHtml() } // Call Zend_View_Helper_FormMultiCheckboxTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormMultiCheckboxTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormMultiCheckboxTest::main") { Zend_View_Helper_FormMultiCheckboxTest::main(); } diff --git a/tests/Zend/View/Helper/FormPasswordTest.php b/tests/Zend/View/Helper/FormPasswordTest.php index b743ea90a3..9850df3938 100644 --- a/tests/Zend/View/Helper/FormPasswordTest.php +++ b/tests/Zend/View/Helper/FormPasswordTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -77,7 +77,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { if (Zend_Registry::isRegistered('Zend_View_Helper_Doctype')) { $registry = Zend_Registry::getInstance(); @@ -157,6 +157,6 @@ public function testRenderPasswordAttribShouldNeverBeRendered() } // Call Zend_View_Helper_FormPasswordTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormPasswordTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormPasswordTest::main") { Zend_View_Helper_FormPasswordTest::main(); } diff --git a/tests/Zend/View/Helper/FormRadioTest.php b/tests/Zend/View/Helper/FormRadioTest.php index dea6fb497f..e5dfedc4c1 100644 --- a/tests/Zend/View/Helper/FormRadioTest.php +++ b/tests/Zend/View/Helper/FormRadioTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->view->doctype('HTML4_LOOSE'); // Set default doctype @@ -530,6 +530,6 @@ public function testeparatorCanRendersAsHtml() } // Call Zend_View_Helper_FormRadioTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormRadioTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormRadioTest::main") { Zend_View_Helper_FormRadioTest::main(); } diff --git a/tests/Zend/View/Helper/FormResetTest.php b/tests/Zend/View/Helper/FormResetTest.php index b4797ca9cc..eb5916944c 100644 --- a/tests/Zend/View/Helper/FormResetTest.php +++ b/tests/Zend/View/Helper/FormResetTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (Zend_Registry::isRegistered('Zend_View_Helper_Doctype')) { $registry = Zend_Registry::getInstance(); @@ -91,7 +91,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper, $this->view); } @@ -133,6 +133,6 @@ public function testShouldAllowRenderingAsXHtml() } // Call Zend_View_Helper_FormResetTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormResetTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormResetTest::main") { Zend_View_Helper_FormResetTest::main(); } diff --git a/tests/Zend/View/Helper/FormSelectTest.php b/tests/Zend/View/Helper/FormSelectTest.php index c8900723fa..a2da2fd985 100644 --- a/tests/Zend/View/Helper/FormSelectTest.php +++ b/tests/Zend/View/Helper/FormSelectTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -73,7 +73,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_FormSelect(); @@ -86,7 +86,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper, $this->view); } @@ -394,6 +394,6 @@ public function testCanApplyOptionClasses() } // Call Zend_View_Helper_FormSelectTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormSelectTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormSelectTest::main") { Zend_View_Helper_FormSelectTest::main(); } diff --git a/tests/Zend/View/Helper/FormSubmitTest.php b/tests/Zend/View/Helper/FormSubmitTest.php index 847a5e39c9..e1d07868d1 100644 --- a/tests/Zend/View/Helper/FormSubmitTest.php +++ b/tests/Zend/View/Helper/FormSubmitTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { if (Zend_Registry::isRegistered('Zend_View_Helper_Doctype')) { $registry = Zend_Registry::getInstance(); @@ -91,7 +91,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper, $this->view); } @@ -154,6 +154,6 @@ public function testDoesNotOutputEmptyId() } // Call Zend_View_Helper_FormSubmitTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormSubmitTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormSubmitTest::main") { Zend_View_Helper_FormSubmitTest::main(); } diff --git a/tests/Zend/View/Helper/FormTest.php b/tests/Zend/View/Helper/FormTest.php index 2840522b56..6cf7480700 100644 --- a/tests/Zend/View/Helper/FormTest.php +++ b/tests/Zend/View/Helper/FormTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_Form(); @@ -87,7 +87,7 @@ protected function setUp(): void * * @access protected */ - protected function tearDown(): void + protected function tear_down() { } @@ -195,6 +195,6 @@ public function testEmptyActionShouldNotRenderActionAttributeInHTML5() } // Call Zend_View_Helper_FormTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormTest::main") { Zend_View_Helper_FormTest::main(); } diff --git a/tests/Zend/View/Helper/FormTextTest.php b/tests/Zend/View/Helper/FormTextTest.php index b2c1ab9b20..9aaa4fc00c 100644 --- a/tests/Zend/View/Helper/FormTextTest.php +++ b/tests/Zend/View/Helper/FormTextTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -76,7 +76,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { if (Zend_Registry::isRegistered('Zend_View_Helper_Doctype')) { $registry = Zend_Registry::getInstance(); @@ -157,6 +157,6 @@ public function testCanRendersAsXHtml() } // Call Zend_View_Helper_FormTextTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormTextTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormTextTest::main") { Zend_View_Helper_FormTextTest::main(); } diff --git a/tests/Zend/View/Helper/FormTextareaTest.php b/tests/Zend/View/Helper/FormTextareaTest.php index a622bc8e0a..cc098b02c6 100644 --- a/tests/Zend/View/Helper/FormTextareaTest.php +++ b/tests/Zend/View/Helper/FormTextareaTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -78,7 +78,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_FormTextarea(); @@ -115,6 +115,6 @@ public function testDisablingElementDoesNotRenderHiddenElements() } // Call Zend_View_Helper_FormTextareaTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_FormTextareaTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_FormTextareaTest::main") { Zend_View_Helper_FormTextareaTest::main(); } diff --git a/tests/Zend/View/Helper/GravatarTest.php b/tests/Zend/View/Helper/GravatarTest.php index 0720c1ffff..5c9ef554e1 100644 --- a/tests/Zend/View/Helper/GravatarTest.php +++ b/tests/Zend/View/Helper/GravatarTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** * Prepares the environment before running a test. */ - protected function setUp(): void + protected function set_up() { $this->_object = new Zend_View_Helper_Gravatar(); $this->_view = new Zend_View(); @@ -88,7 +88,7 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { unset($this->_object, $this->_view); } @@ -317,6 +317,6 @@ public function testInvalidKeyPassedToSetOptionsMethod() } // Call Zend_View_Helper_BaseUrlTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == 'Zend_View_Helper_BaseUrlTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_View_Helper_BaseUrlTest::main') { Zend_View_Helper_BaseUrlTest::main(); } diff --git a/tests/Zend/View/Helper/HeadLinkTest.php b/tests/Zend/View/Helper/HeadLinkTest.php index b78270369c..5f7bec9b07 100644 --- a/tests/Zend/View/Helper/HeadLinkTest.php +++ b/tests/Zend/View/Helper/HeadLinkTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -87,7 +87,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { foreach ([Zend_View_Helper_Placeholder_Registry::REGISTRY_KEY, 'Zend_View_Helper_Doctype'] as $key) { if (Zend_Registry::isRegistered($key)) { @@ -107,7 +107,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -346,8 +346,8 @@ public function testStylesheetAttributesGetSet() { $this->helper->setStylesheet('/styles.css', 'projection', 'ie6'); $item = $this->helper->getValue(); - $this->assertObjectHasAttribute('media', $item); - $this->assertObjectHasAttribute('conditionalStylesheet', $item); + $this->assertObjectHasProperty('media', $item); + $this->assertObjectHasProperty('conditionalStylesheet', $item); $this->assertEquals('projection', $item->media); $this->assertEquals('ie6', $item->conditionalStylesheet); @@ -357,7 +357,7 @@ public function testConditionalStylesheetNotCreatedByDefault() { $this->helper->setStylesheet('/styles.css'); $item = $this->helper->getValue(); - $this->assertObjectHasAttribute('conditionalStylesheet', $item); + $this->assertObjectHasProperty('conditionalStylesheet', $item); $this->assertFalse($item->conditionalStylesheet); $string = $this->helper->toString(); @@ -371,7 +371,7 @@ public function testConditionalStylesheetCreationOccursWhenRequested() { $this->helper->setStylesheet('/styles.css', 'screen', 'ie6'); $item = $this->helper->getValue(); - $this->assertObjectHasAttribute('conditionalStylesheet', $item); + $this->assertObjectHasProperty('conditionalStylesheet', $item); $this->assertEquals('ie6', $item->conditionalStylesheet); $string = $this->helper->toString(); @@ -542,7 +542,7 @@ public function testConditionalStylesheetCreationNoIE() { $this->helper->setStylesheet('/styles.css', 'screen', '!IE'); $item = $this->helper->getValue(); - $this->assertObjectHasAttribute('conditionalStylesheet', $item); + $this->assertObjectHasProperty('conditionalStylesheet', $item); $this->assertEquals('!IE', $item->conditionalStylesheet); $string = $this->helper->toString(); $this->assertStringContainsString('/styles.css', $string); @@ -557,7 +557,7 @@ public function testConditionalStylesheetCreationNoIEWidthSpaces() { $this->helper->setStylesheet('/styles.css', 'screen', '! IE'); $item = $this->helper->getValue(); - $this->assertObjectHasAttribute('conditionalStylesheet', $item); + $this->assertObjectHasProperty('conditionalStylesheet', $item); $this->assertEquals('! IE', $item->conditionalStylesheet); $string = $this->helper->toString(); $this->assertStringContainsString('/styles.css', $string); @@ -567,6 +567,6 @@ public function testConditionalStylesheetCreationNoIEWidthSpaces() } // Call Zend_View_Helper_HeadLinkTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_HeadLinkTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_HeadLinkTest::main") { Zend_View_Helper_HeadLinkTest::main(); } diff --git a/tests/Zend/View/Helper/HeadMetaTest.php b/tests/Zend/View/Helper/HeadMetaTest.php index 0f5df86ac0..4291ea388f 100644 --- a/tests/Zend/View/Helper/HeadMetaTest.php +++ b/tests/Zend/View/Helper/HeadMetaTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -91,7 +91,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->error = false; foreach ([Zend_View_Helper_Placeholder_Registry::REGISTRY_KEY, 'Zend_View_Helper_Doctype'] as $key) { @@ -113,7 +113,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -186,10 +186,10 @@ protected function _testOverloadAppend($type) $this->assertEquals($i + 1, count($values)); $item = $values[$i]; - $this->assertObjectHasAttribute('type', $item); - $this->assertObjectHasAttribute('modifiers', $item); - $this->assertObjectHasAttribute('content', $item); - $this->assertObjectHasAttribute($item->type, $item); + $this->assertObjectHasProperty('type', $item); + $this->assertObjectHasProperty('modifiers', $item); + $this->assertObjectHasProperty('content', $item); + $this->assertObjectHasProperty($item->type, $item); $this->assertEquals('keywords', $item->{$item->type}); $this->assertEquals($string, $item->content); } @@ -206,10 +206,10 @@ protected function _testOverloadPrepend($type) $this->assertEquals($i + 1, count($values)); $item = array_shift($values); - $this->assertObjectHasAttribute('type', $item); - $this->assertObjectHasAttribute('modifiers', $item); - $this->assertObjectHasAttribute('content', $item); - $this->assertObjectHasAttribute($item->type, $item); + $this->assertObjectHasProperty('type', $item); + $this->assertObjectHasProperty('modifiers', $item); + $this->assertObjectHasProperty('content', $item); + $this->assertObjectHasProperty($item->type, $item); $this->assertEquals('keywords', $item->{$item->type}); $this->assertEquals($string, $item->content); } @@ -229,10 +229,10 @@ protected function _testOverloadSet($type) $this->assertEquals(1, count($values)); $item = array_shift($values); - $this->assertObjectHasAttribute('type', $item); - $this->assertObjectHasAttribute('modifiers', $item); - $this->assertObjectHasAttribute('content', $item); - $this->assertObjectHasAttribute($item->type, $item); + $this->assertObjectHasProperty('type', $item); + $this->assertObjectHasProperty('modifiers', $item); + $this->assertObjectHasProperty('content', $item); + $this->assertObjectHasProperty($item->type, $item); $this->assertEquals('keywords', $item->{$item->type}); $this->assertEquals($string, $item->content); } @@ -296,7 +296,7 @@ public function testCanBuildMetaTagsWithAttributes() $this->helper->setName('keywords', 'foo bar', ['lang' => 'us_en', 'scheme' => 'foo', 'bogus' => 'unused']); $value = $this->helper->getValue(); - $this->assertObjectHasAttribute('modifiers', $value); + $this->assertObjectHasProperty('modifiers', $value); $modifiers = $value->modifiers; $this->assertTrue(array_key_exists('lang', $modifiers)); $this->assertEquals('us_en', $modifiers['lang']); @@ -595,6 +595,6 @@ public function testConditionalNoIEWidthSpace() } // Call Zend_View_Helper_HeadMetaTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_HeadMetaTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_HeadMetaTest::main") { Zend_View_Helper_HeadMetaTest::main(); } diff --git a/tests/Zend/View/Helper/HeadScriptTest.php b/tests/Zend/View/Helper/HeadScriptTest.php index 643f556aa2..75a5d9048b 100644 --- a/tests/Zend/View/Helper/HeadScriptTest.php +++ b/tests/Zend/View/Helper/HeadScriptTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -79,7 +79,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $regKey = Zend_View_Helper_Placeholder_Registry::REGISTRY_KEY; if (Zend_Registry::isRegistered($regKey)) { @@ -96,7 +96,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -301,16 +301,16 @@ public function testHeadScriptAppropriatelySetsScriptItems() $item = $items[$i]; switch ($i) { case 0: - $this->assertObjectHasAttribute('source', $item); + $this->assertObjectHasProperty('source', $item); $this->assertEquals('bar', $item->source); break; case 1: - $this->assertObjectHasAttribute('attributes', $item); + $this->assertObjectHasProperty('attributes', $item); $this->assertTrue(isset($item->attributes['src'])); $this->assertEquals('foo', $item->attributes['src']); break; case 2: - $this->assertObjectHasAttribute('source', $item); + $this->assertObjectHasProperty('source', $item); $this->assertEquals('baz', $item->source); break; } @@ -567,6 +567,6 @@ public function testConditionalScriptNoIE() } // Call Zend_View_Helper_HeadScriptTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_HeadScriptTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_HeadScriptTest::main") { Zend_View_Helper_HeadScriptTest::main(); } diff --git a/tests/Zend/View/Helper/HeadStyleTest.php b/tests/Zend/View/Helper/HeadStyleTest.php index 0611d00ad7..4dff08d4da 100644 --- a/tests/Zend/View/Helper/HeadStyleTest.php +++ b/tests/Zend/View/Helper/HeadStyleTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -79,7 +79,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $regKey = Zend_View_Helper_Placeholder_Registry::REGISTRY_KEY; if (Zend_Registry::isRegistered($regKey)) { @@ -96,7 +96,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -156,8 +156,8 @@ public function testOverloadAppendStyleAppendsStyleToStack() $item = $values[$i]; $this->assertTrue($item instanceof stdClass); - $this->assertObjectHasAttribute('content', $item); - $this->assertObjectHasAttribute('attributes', $item); + $this->assertObjectHasProperty('content', $item); + $this->assertObjectHasProperty('attributes', $item); $this->assertEquals($string, $item->content); } } @@ -173,8 +173,8 @@ public function testOverloadPrependStylePrependsStyleToStack() $item = array_shift($values); $this->assertTrue($item instanceof stdClass); - $this->assertObjectHasAttribute('content', $item); - $this->assertObjectHasAttribute('attributes', $item); + $this->assertObjectHasProperty('content', $item); + $this->assertObjectHasProperty('attributes', $item); $this->assertEquals($string, $item->content); } } @@ -192,8 +192,8 @@ public function testOverloadSetOversitesStack() $item = array_shift($values); $this->assertTrue($item instanceof stdClass); - $this->assertObjectHasAttribute('content', $item); - $this->assertObjectHasAttribute('attributes', $item); + $this->assertObjectHasProperty('content', $item); + $this->assertObjectHasProperty('attributes', $item); $this->assertEquals($string, $item->content); } @@ -208,7 +208,7 @@ public function testCanBuildStyleTagsWithAttributes() ]); $value = $this->helper->getValue(); - $this->assertObjectHasAttribute('attributes', $value); + $this->assertObjectHasProperty('attributes', $value); $attributes = $value->attributes; $this->assertTrue(isset($attributes['lang'])); @@ -506,6 +506,6 @@ public function testConditionalScriptNoIEWidthSpace() } // Call Zend_View_Helper_HeadStyleTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_HeadStyleTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_HeadStyleTest::main") { Zend_View_Helper_HeadStyleTest::main(); } diff --git a/tests/Zend/View/Helper/HeadTitleTest.php b/tests/Zend/View/Helper/HeadTitleTest.php index 860e816c6b..c88d4c8870 100644 --- a/tests/Zend/View/Helper/HeadTitleTest.php +++ b/tests/Zend/View/Helper/HeadTitleTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -79,7 +79,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $regKey = Zend_View_Helper_Placeholder_Registry::REGISTRY_KEY; if (Zend_Registry::isRegistered($regKey)) { @@ -96,7 +96,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -253,6 +253,6 @@ public function testReturnTypeDefaultAttachOrder() } // Call Zend_View_Helper_HeadTitleTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_HeadTitleTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_HeadTitleTest::main") { Zend_View_Helper_HeadTitleTest::main(); } diff --git a/tests/Zend/View/Helper/HtmlFlashTest.php b/tests/Zend/View/Helper/HtmlFlashTest.php index 7d1ad4e931..8e18f8202c 100644 --- a/tests/Zend/View/Helper/HtmlFlashTest.php +++ b/tests/Zend/View/Helper/HtmlFlashTest.php @@ -1,6 +1,6 @@ run($suite); + (new resources_Runner())->run($suite); } /** @@ -72,14 +72,14 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_HtmlFlash(); $this->helper->setView($this->view); } - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -96,6 +96,6 @@ public function testMakeHtmlFlash() } // Call Zend_View_Helper_HtmlFlashTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_HtmlFlashTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_HtmlFlashTest::main") { Zend_View_Helper_HtmlFlashTest::main(); } diff --git a/tests/Zend/View/Helper/HtmlListTest.php b/tests/Zend/View/Helper/HtmlListTest.php index 547edd6f2f..35914b15dd 100644 --- a/tests/Zend/View/Helper/HtmlListTest.php +++ b/tests/Zend/View/Helper/HtmlListTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -72,14 +72,14 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_HtmlList(); $this->helper->setView($this->view); } - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -265,6 +265,6 @@ public function validateItems($value, $key, $userdata) } // Call Zend_View_Helper_HtmlListTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_HtmlListTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_HtmlListTest::main") { Zend_View_Helper_HtmlListTest::main(); } diff --git a/tests/Zend/View/Helper/HtmlObjectTest.php b/tests/Zend/View/Helper/HtmlObjectTest.php index f84c511347..f81a96f70e 100644 --- a/tests/Zend/View/Helper/HtmlObjectTest.php +++ b/tests/Zend/View/Helper/HtmlObjectTest.php @@ -1,6 +1,6 @@ run($suite); + (new resources_Runner())->run($suite); } /** @@ -72,14 +72,14 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_HtmlObject(); $this->helper->setView($this->view); } - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -157,6 +157,6 @@ public function testMakeHtmlObjectWithContent() } // Call Zend_View_Helper_HtmlObjectTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_HtmlObjectTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_HtmlObjectTest::main") { Zend_View_Helper_HtmlObjectTest::main(); } diff --git a/tests/Zend/View/Helper/HtmlPageTest.php b/tests/Zend/View/Helper/HtmlPageTest.php index 157e78354f..332d55c144 100644 --- a/tests/Zend/View/Helper/HtmlPageTest.php +++ b/tests/Zend/View/Helper/HtmlPageTest.php @@ -1,6 +1,6 @@ run($suite); + (new resources_Runner())->run($suite); } /** @@ -72,14 +72,14 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_HtmlPage(); $this->helper->setView($this->view); } - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -98,6 +98,6 @@ public function testMakeHtmlPage() } // Call Zend_View_Helper_HtmlPageTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_HtmlPageTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_HtmlPageTest::main") { Zend_View_Helper_HtmlPageTest::main(); } diff --git a/tests/Zend/View/Helper/HtmlQuicktimeTest.php b/tests/Zend/View/Helper/HtmlQuicktimeTest.php index 1cefc4542a..615f0e8d5e 100644 --- a/tests/Zend/View/Helper/HtmlQuicktimeTest.php +++ b/tests/Zend/View/Helper/HtmlQuicktimeTest.php @@ -1,6 +1,6 @@ run($suite); + (new resources_Runner())->run($suite); } /** @@ -71,14 +71,14 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->view = new Zend_View(); $this->helper = new Zend_View_Helper_HtmlQuicktime(); $this->helper->setView($this->view); } - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -98,6 +98,6 @@ public function testMakeHtmlQuicktime() } // Call Zend_View_Helper_HtmlQuicktimeTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_HtmlQuicktimeTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_HtmlQuicktimeTest::main") { Zend_View_Helper_HtmlQuicktimeTest::main(); } diff --git a/tests/Zend/View/Helper/InlineScriptTest.php b/tests/Zend/View/Helper/InlineScriptTest.php index 234faf6d2a..a82c04ccfa 100644 --- a/tests/Zend/View/Helper/InlineScriptTest.php +++ b/tests/Zend/View/Helper/InlineScriptTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -79,7 +79,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $regKey = Zend_View_Helper_Placeholder_Registry::REGISTRY_KEY; if (Zend_Registry::isRegistered($regKey)) { @@ -96,7 +96,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -120,6 +120,6 @@ public function testInlineScriptReturnsObjectInstance() } // Call Zend_View_Helper_InlineScriptTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_InlineScriptTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_InlineScriptTest::main") { Zend_View_Helper_InlineScriptTest::main(); } diff --git a/tests/Zend/View/Helper/JsonTest.php b/tests/Zend/View/Helper/JsonTest.php index 5690df3b50..88badefe31 100644 --- a/tests/Zend/View/Helper/JsonTest.php +++ b/tests/Zend/View/Helper/JsonTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -76,7 +76,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_View_Helper_JsonTest_Layout::resetMvcInstance(); @@ -96,7 +96,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -209,6 +209,6 @@ public static function resetMvcInstance() } // Call Zend_View_Helper_JsonTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_JsonTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_JsonTest::main") { Zend_View_Helper_JsonTest::main(); } diff --git a/tests/Zend/View/Helper/LayoutTest.php b/tests/Zend/View/Helper/LayoutTest.php index ff1744af23..19b4f12c5a 100644 --- a/tests/Zend/View/Helper/LayoutTest.php +++ b/tests/Zend/View/Helper/LayoutTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -65,7 +65,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { Zend_Controller_Front::getInstance()->resetInstance(); if (Zend_Controller_Action_HelperBroker::hasHelper('Layout')) { @@ -84,7 +84,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { } @@ -137,6 +137,6 @@ public static function resetMvcInstance() } // Call Zend_View_Helper_LayoutTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_LayoutTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_LayoutTest::main") { Zend_View_Helper_LayoutTest::main(); } diff --git a/tests/Zend/View/Helper/Navigation/AllTests.php b/tests/Zend/View/Helper/Navigation/AllTests.php index 0aac7030e0..ac0396f779 100644 --- a/tests/Zend/View/Helper/Navigation/AllTests.php +++ b/tests/Zend/View/Helper/Navigation/AllTests.php @@ -52,7 +52,7 @@ class Zend_View_Helper_Navigation_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -69,6 +69,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_View_Helper_Navigation_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_View_Helper_Navigation_AllTests::main') { Zend_View_Helper_Navigation_AllTests::main(); } diff --git a/tests/Zend/View/Helper/Navigation/LinksTest.php b/tests/Zend/View/Helper/Navigation/LinksTest.php index 09c5a25c80..88092870f3 100644 --- a/tests/Zend/View/Helper/Navigation/LinksTest.php +++ b/tests/Zend/View/Helper/Navigation/LinksTest.php @@ -53,9 +53,9 @@ class Zend_View_Helper_Navigation_LinksTest extends Zend_View_Helper_Navigation_ private $_doctypeHelper; private $_oldDoctype; - protected function setUp(): void + protected function set_up() { - parent::setUp(); + parent::set_up(); // doctype fix (someone forgot to clean up after their unit tests) $this->_doctypeHelper = $this->_helper->view->doctype(); @@ -70,7 +70,7 @@ protected function setUp(): void } } - protected function tearDown(): void + protected function tear_down() { $this->_doctypeHelper->setDoctype($this->_oldDoctype); } diff --git a/tests/Zend/View/Helper/Navigation/SitemapTest.php b/tests/Zend/View/Helper/Navigation/SitemapTest.php index c8e338000d..1ca8b4b3e8 100644 --- a/tests/Zend/View/Helper/Navigation/SitemapTest.php +++ b/tests/Zend/View/Helper/Navigation/SitemapTest.php @@ -57,7 +57,7 @@ class Zend_View_Helper_Navigation_SitemapTest extends Zend_View_Helper_Navigatio */ protected $_helper; - protected function setUp(): void + protected function set_up() { date_default_timezone_set('Europe/Berlin'); @@ -85,12 +85,12 @@ protected function setUp(): void $this->_front->setRequest(new Zend_Controller_Request_Http()); $this->_front->getRouter()->addDefaultRoutes(); - parent::setUp(); + parent::set_up(); $this->_helper->setFormatOutput(true); } - protected function tearDown(): void + protected function tear_down() { if (null !== $this->_oldRequest) { $this->_front->setRequest($this->_oldRequest); diff --git a/tests/Zend/View/Helper/Navigation/TestAbstract.php b/tests/Zend/View/Helper/Navigation/TestAbstract.php index 1b8a8cd891..13f105acb6 100644 --- a/tests/Zend/View/Helper/Navigation/TestAbstract.php +++ b/tests/Zend/View/Helper/Navigation/TestAbstract.php @@ -1,6 +1,6 @@ run($suite); + (new resources_Runner())->run($suite); } /** @@ -70,7 +70,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $view = new Zend_View(); $view->addBasePath(dirname(__FILE__) . '/_files'); @@ -81,7 +81,7 @@ protected function setUp(): void $this->_paginator = Zend_Paginator::factory(range(1, 101)); } - protected function tearDown(): void + protected function tear_down() { unset($this->_viewHelper); unset($this->_paginator); @@ -219,6 +219,6 @@ public function testCanUseObjectForScrollingStyle() } // Call Zend_View_Helper_PaginationControlTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_PaginationControlTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_PaginationControlTest::main") { Zend_View_Helper_PaginationControlTest::main(); } diff --git a/tests/Zend/View/Helper/PartialLoopTest.php b/tests/Zend/View/Helper/PartialLoopTest.php index 2c91216fe9..132a885002 100644 --- a/tests/Zend/View/Helper/PartialLoopTest.php +++ b/tests/Zend/View/Helper/PartialLoopTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -79,7 +79,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->basePath = dirname(__FILE__) . '/_files/modules'; $this->helper = new Zend_View_Helper_PartialLoop(); @@ -92,7 +92,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -602,6 +602,6 @@ public function toArray() } // Call Zend_View_Helper_PartialLoopTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_PartialLoopTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_PartialLoopTest::main") { Zend_View_Helper_PartialLoopTest::main(); } diff --git a/tests/Zend/View/Helper/PartialTest.php b/tests/Zend/View/Helper/PartialTest.php index 9ab9d3bd2e..9c19f14bf9 100644 --- a/tests/Zend/View/Helper/PartialTest.php +++ b/tests/Zend/View/Helper/PartialTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -79,7 +79,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->basePath = dirname(__FILE__) . '/_files/modules'; $this->helper = new Zend_View_Helper_Partial(); @@ -92,7 +92,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -310,6 +310,6 @@ public function toArray() } // Call Zend_View_Helper_PartialTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_PartialTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_PartialTest::main") { Zend_View_Helper_PartialTest::main(); } diff --git a/tests/Zend/View/Helper/Placeholder/ContainerTest.php b/tests/Zend/View/Helper/Placeholder/ContainerTest.php index ffb5ce55c0..18b1b3e780 100644 --- a/tests/Zend/View/Helper/Placeholder/ContainerTest.php +++ b/tests/Zend/View/Helper/Placeholder/ContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->container = new Zend_View_Helper_Placeholder_Container([]); } @@ -79,7 +79,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->container); } @@ -469,6 +469,6 @@ public function testContainerWithoutItemsShouldAlwaysReturnEmptyString() } // Call Zend_View_Helper_Placeholder_ContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_Placeholder_ContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_Placeholder_ContainerTest::main") { Zend_View_Helper_Placeholder_ContainerTest::main(); } diff --git a/tests/Zend/View/Helper/Placeholder/RegistryTest.php b/tests/Zend/View/Helper/Placeholder/RegistryTest.php index 8adf0be516..15471f0ac7 100644 --- a/tests/Zend/View/Helper/Placeholder/RegistryTest.php +++ b/tests/Zend/View/Helper/Placeholder/RegistryTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -68,7 +68,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $registry = Zend_Registry::getInstance(); if (isset($registry[Zend_View_Helper_Placeholder_Registry::REGISTRY_KEY])) { @@ -83,7 +83,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->registry); } @@ -242,6 +242,6 @@ class Zend_View_Helper_Placeholder_RegistryTest_BogusContainer } // Call Zend_View_Helper_Placeholder_RegistryTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_Placeholder_RegistryTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_Placeholder_RegistryTest::main") { Zend_View_Helper_Placeholder_RegistryTest::main(); } diff --git a/tests/Zend/View/Helper/Placeholder/StandaloneContainerTest.php b/tests/Zend/View/Helper/Placeholder/StandaloneContainerTest.php index 14433d6f03..54fde9dfcd 100644 --- a/tests/Zend/View/Helper/Placeholder/StandaloneContainerTest.php +++ b/tests/Zend/View/Helper/Placeholder/StandaloneContainerTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -82,7 +82,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $regKey = Zend_View_Helper_Placeholder_Registry::REGISTRY_KEY; if (Zend_Registry::isRegistered($regKey)) { @@ -99,7 +99,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); } @@ -133,6 +133,6 @@ class Zend_View_Helper_Placeholder_StandaloneContainerTest_Foo extends Zend_View } // Call Zend_View_Helper_Placeholder_StandaloneContainerTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_Placeholder_StandaloneContainerTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_Placeholder_StandaloneContainerTest::main") { Zend_View_Helper_Placeholder_StandaloneContainerTest::main(); } diff --git a/tests/Zend/View/Helper/PlaceholderTest.php b/tests/Zend/View/Helper/PlaceholderTest.php index 5df148f263..3d1ee502c8 100644 --- a/tests/Zend/View/Helper/PlaceholderTest.php +++ b/tests/Zend/View/Helper/PlaceholderTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -74,7 +74,7 @@ public static function main() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->placeholder = new Zend_View_Helper_Placeholder(); } @@ -85,7 +85,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->placeholder); Zend_Registry::getInstance()->offsetUnset(Zend_View_Helper_Placeholder_Registry::REGISTRY_KEY); @@ -143,6 +143,6 @@ public function testPlaceholderRetrievesSameContainerOnSubsequentCalls() } // Call Zend_View_Helper_PlaceholderTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_PlaceholderTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_PlaceholderTest::main") { Zend_View_Helper_PlaceholderTest::main(); } diff --git a/tests/Zend/View/Helper/RenderToPlaceholderTest.php b/tests/Zend/View/Helper/RenderToPlaceholderTest.php index aadfe7637a..786af38dd6 100644 --- a/tests/Zend/View/Helper/RenderToPlaceholderTest.php +++ b/tests/Zend/View/Helper/RenderToPlaceholderTest.php @@ -1,6 +1,6 @@ _view = new Zend_View(['scriptPath' => dirname(__FILE__) . '/_files/scripts/']); } diff --git a/tests/Zend/View/Helper/ServerUrlTest.php b/tests/Zend/View/Helper/ServerUrlTest.php index c8c31099b5..779032700a 100644 --- a/tests/Zend/View/Helper/ServerUrlTest.php +++ b/tests/Zend/View/Helper/ServerUrlTest.php @@ -1,6 +1,6 @@ _serverBackup = $_SERVER; unset($_SERVER['HTTPS']); @@ -58,7 +58,7 @@ protected function setUp(): void /** * Cleans up the environment after running a test. */ - protected function tearDown(): void + protected function tear_down() { $_SERVER = $this->_serverBackup; } diff --git a/tests/Zend/View/Helper/TranslateTest.php b/tests/Zend/View/Helper/TranslateTest.php index fe6f7b76ad..8f3a6cd2dc 100644 --- a/tests/Zend/View/Helper/TranslateTest.php +++ b/tests/Zend/View/Helper/TranslateTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function clearRegistry() @@ -89,7 +89,7 @@ public function clearRegistry() * * @return void */ - protected function setUp(): void + protected function set_up() { $this->clearRegistry(); $this->helper = new Zend_View_Helper_Translate(); @@ -101,7 +101,7 @@ protected function setUp(): void * * @return void */ - protected function tearDown(): void + protected function tear_down() { unset($this->helper); $this->clearRegistry(); @@ -268,6 +268,6 @@ public function testTranslationWithoutTranslator() } // Call Zend_View_Helper_TranslateTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_TranslateTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_TranslateTest::main") { Zend_View_Helper_TranslateTest::main(); } diff --git a/tests/Zend/View/Helper/UrlTest.php b/tests/Zend/View/Helper/UrlTest.php index 197ad72651..5a7186f512 100644 --- a/tests/Zend/View/Helper/UrlTest.php +++ b/tests/Zend/View/Helper/UrlTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -81,7 +81,7 @@ public static function main() * * @access protected */ - protected function setUp(): void + protected function set_up() { $this->front = Zend_Controller_Front::getInstance(); $this->front->getRouter()->addDefaultRoutes(); @@ -105,6 +105,6 @@ public function testDefault() } // Call Zend_View_Helper_UrlTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_UrlTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_UrlTest::main") { Zend_View_Helper_UrlTest::main(); } diff --git a/tests/Zend/View/Helper/UserAgentTest.php b/tests/Zend/View/Helper/UserAgentTest.php index 144d752be4..65c04ab5ee 100644 --- a/tests/Zend/View/Helper/UserAgentTest.php +++ b/tests/Zend/View/Helper/UserAgentTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** * Sets up the fixture, for example, open a network connection. * This method is called before a test is executed. */ - protected function setUp(): void + protected function set_up() { $this->helper = new Zend_View_Helper_UserAgent(); $this->userAgent = new Zend_Http_UserAgent(); @@ -106,6 +106,6 @@ public function testSetAndGetUserAgent() } // Call Zend_View_Helper_UrlTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_View_Helper_UserAgentTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_View_Helper_UserAgentTest::main") { Zend_View_Helper_UserAgentTest::main(); } diff --git a/tests/Zend/ViewTest.php b/tests/Zend/ViewTest.php index 63b642ceb3..0cfb5718f0 100644 --- a/tests/Zend/ViewTest.php +++ b/tests/Zend/ViewTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { $this->notices = []; $this->errorReporting = error_reporting(); $this->displayErrors = ini_get('display_errors'); } - protected function tearDown(): void + protected function tear_down() { error_reporting($this->errorReporting); ini_set('display_errors', $this->displayErrors); @@ -1188,6 +1188,6 @@ public function init() } // Call Zend_ViewTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_ViewTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_ViewTest::main") { Zend_ViewTest::main(); } diff --git a/tests/Zend/Wildfire/AllTests.php b/tests/Zend/Wildfire/AllTests.php index a3facf52cb..6c53d4e296 100644 --- a/tests/Zend/Wildfire/AllTests.php +++ b/tests/Zend/Wildfire/AllTests.php @@ -42,7 +42,7 @@ class Zend_Wildfire_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -55,6 +55,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Wildfire_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Wildfire_AllTests::main') { Zend_Wildfire_AllTests::main(); } diff --git a/tests/Zend/Wildfire/WildfireTest.php b/tests/Zend/Wildfire/WildfireTest.php index 794257cbe6..d60c9ab67f 100644 --- a/tests/Zend/Wildfire/WildfireTest.php +++ b/tests/Zend/Wildfire/WildfireTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } - protected function setUp(): void + protected function set_up() { date_default_timezone_set('America/Los_Angeles'); Zend_Wildfire_Channel_HttpHeaders::destroyInstance(); Zend_Wildfire_Plugin_FirePhp::destroyInstance(); } - protected function tearDown(): void + protected function tear_down() { Zend_Controller_Front::getInstance()->resetInstance(); Zend_Wildfire_Channel_HttpHeaders::destroyInstance(); @@ -1236,6 +1236,6 @@ public function verifyHeaders($headers) } } -if (PHPUnit_MAIN_METHOD == 'Zend_Wildfire_WildfireTest::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Wildfire_WildfireTest::main') { Zend_Wildfire_WildfireTest::main(); } diff --git a/tests/Zend/Xml/AllTests.php b/tests/Zend/Xml/AllTests.php index d8cdc61b7c..e44cbc925e 100644 --- a/tests/Zend/Xml/AllTests.php +++ b/tests/Zend/Xml/AllTests.php @@ -43,7 +43,7 @@ class Zend_Xml_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -57,6 +57,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_Xml_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_Xml_AllTests::main') { Zend_Xml_AllTests::main(); } diff --git a/tests/Zend/Xml/MultibyteTest.php b/tests/Zend/Xml/MultibyteTest.php index 6b23ad5cf8..be8e7ea632 100644 --- a/tests/Zend/Xml/MultibyteTest.php +++ b/tests/Zend/Xml/MultibyteTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function multibyteEncodings() @@ -162,6 +162,6 @@ public function testDetectsXXEWhenXMLDocumentEncodingDiffersFromFileEncoding($en } } -if (PHPUnit_MAIN_METHOD == "Zend_Xml_MultibyteTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Xml_MultibyteTest::main") { Zend_Xml_MultibyteTest::main(); } diff --git a/tests/Zend/Xml/SecurityTest.php b/tests/Zend/Xml/SecurityTest.php index 10c282595d..15698c84e4 100644 --- a/tests/Zend/Xml/SecurityTest.php +++ b/tests/Zend/Xml/SecurityTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } public function testScanForXEE() @@ -169,6 +169,6 @@ protected function _getXml() } } -if (PHPUnit_MAIN_METHOD == "Zend_Xml_SecurityTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_Xml_SecurityTest::main") { Zend_Xml_SecurityTest::main(); } diff --git a/tests/Zend/XmlRpc/AllTests.php b/tests/Zend/XmlRpc/AllTests.php index 91c18faf0d..ad289b6cb0 100644 --- a/tests/Zend/XmlRpc/AllTests.php +++ b/tests/Zend/XmlRpc/AllTests.php @@ -52,7 +52,7 @@ class Zend_XmlRpc_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } public static function suite() @@ -75,6 +75,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'Zend_XmlRpc_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'Zend_XmlRpc_AllTests::main') { Zend_XmlRpc_AllTests::main(); } diff --git a/tests/Zend/XmlRpc/BigIntegerValueTest.php b/tests/Zend/XmlRpc/BigIntegerValueTest.php index a9c1e218ad..831a039076 100644 --- a/tests/Zend/XmlRpc/BigIntegerValueTest.php +++ b/tests/Zend/XmlRpc/BigIntegerValueTest.php @@ -1,6 +1,6 @@ httpAdapter = new Zend_Http_Client_Adapter_Test(); $this->httpClient = new Zend_Http_Client( @@ -828,6 +828,6 @@ public function getProxy($namespace = '') } // Call Zend_XmlRpc_ClientTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_XmlRpc_ClientTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_XmlRpc_ClientTest::main") { Zend_XmlRpc_ClientTest::main(); } diff --git a/tests/Zend/XmlRpc/FaultTest.php b/tests/Zend/XmlRpc/FaultTest.php index d8d87c3cc4..3a9b8fb83b 100644 --- a/tests/Zend/XmlRpc/FaultTest.php +++ b/tests/Zend/XmlRpc/FaultTest.php @@ -1,6 +1,6 @@ _fault = new Zend_XmlRpc_Fault(); } @@ -54,7 +54,7 @@ protected function setUp(): void /** * Teardown environment */ - protected function tearDown(): void + protected function tear_down() { unset($this->_fault); } diff --git a/tests/Zend/XmlRpc/GeneratorTest.php b/tests/Zend/XmlRpc/GeneratorTest.php index 1412696168..66bf77bc6c 100644 --- a/tests/Zend/XmlRpc/GeneratorTest.php +++ b/tests/Zend/XmlRpc/GeneratorTest.php @@ -1,7 +1,7 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** * Setup environment */ - protected function setUp(): void + protected function set_up() { $this->xml = << @@ -126,7 +126,7 @@ protected function setUp(): void /** * Teardown environment */ - protected function tearDown(): void + protected function tear_down() { $_SERVER = $this->server; unset($this->request); @@ -220,6 +220,6 @@ public function __construct($method = null, $params = null) } // Call Zend_XmlRpc_Request_HttpTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_XmlRpc_Request_HttpTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_XmlRpc_Request_HttpTest::main") { Zend_XmlRpc_Request_HttpTest::main(); } diff --git a/tests/Zend/XmlRpc/RequestTest.php b/tests/Zend/XmlRpc/RequestTest.php index ab140eb10a..57dd7d167d 100644 --- a/tests/Zend/XmlRpc/RequestTest.php +++ b/tests/Zend/XmlRpc/RequestTest.php @@ -1,6 +1,6 @@ _request = new Zend_XmlRpc_Request(); } @@ -57,7 +57,7 @@ protected function setUp(): void /** * Teardown environment */ - protected function tearDown(): void + protected function tear_down() { unset($this->_request); } diff --git a/tests/Zend/XmlRpc/ResponseTest.php b/tests/Zend/XmlRpc/ResponseTest.php index 8efdfd3421..453bca3352 100644 --- a/tests/Zend/XmlRpc/ResponseTest.php +++ b/tests/Zend/XmlRpc/ResponseTest.php @@ -1,6 +1,6 @@ _response = new Zend_XmlRpc_Response(); } @@ -59,7 +59,7 @@ protected function setUp(): void /** * Teardown environment */ - protected function tearDown(): void + protected function tear_down() { unset($this->_response); } diff --git a/tests/Zend/XmlRpc/Server/CacheTest.php b/tests/Zend/XmlRpc/Server/CacheTest.php index 44f143fda4..149511c943 100644 --- a/tests/Zend/XmlRpc/Server/CacheTest.php +++ b/tests/Zend/XmlRpc/Server/CacheTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -71,7 +71,7 @@ public static function main() /** * Setup environment */ - protected function setUp(): void + protected function set_up() { $this->_file = realpath(dirname(__FILE__)) . '/xmlrpc.cache'; $this->_server = new Zend_XmlRpc_Server(); @@ -81,7 +81,7 @@ protected function setUp(): void /** * Teardown environment */ - protected function tearDown(): void + protected function tear_down() { if (file_exists($this->_file)) { unlink($this->_file); @@ -133,6 +133,6 @@ public function testShouldReturnFalseWithInvalidCache() } // Call Zend_XmlRpc_Server_CacheTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_XmlRpc_Server_CacheTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_XmlRpc_Server_CacheTest::main") { Zend_XmlRpc_Server_CacheTest::main(); } diff --git a/tests/Zend/XmlRpc/Server/FaultTest.php b/tests/Zend/XmlRpc/Server/FaultTest.php index c4a4cfa636..a4c7332af3 100644 --- a/tests/Zend/XmlRpc/Server/FaultTest.php +++ b/tests/Zend/XmlRpc/Server/FaultTest.php @@ -1,6 +1,6 @@ run($suite); + $result = (new resources_Runner())->run($suite); } /** @@ -301,6 +301,6 @@ public static function getObserved() } // Call Zend_XmlRpc_Server_FaultTest::main() if this source file is executed directly. -if (PHPUnit_MAIN_METHOD == "Zend_XmlRpc_Server_FaultTest::main") { +if (PHPUnit_MAIN_METHOD === "Zend_XmlRpc_Server_FaultTest::main") { Zend_XmlRpc_Server_FaultTest::main(); } diff --git a/tests/Zend/XmlRpc/ServerTest.php b/tests/Zend/XmlRpc/ServerTest.php index 596409df60..b95802702a 100644 --- a/tests/Zend/XmlRpc/ServerTest.php +++ b/tests/Zend/XmlRpc/ServerTest.php @@ -1,6 +1,6 @@ _server = new Zend_XmlRpc_Server(); } @@ -59,7 +59,7 @@ protected function setUp(): void /** * Teardown environment */ - protected function tearDown(): void + protected function tear_down() { unset($this->_server); } @@ -783,4 +783,4 @@ class Zend_XmlRpc_Server_testResponse extends Zend_XmlRpc_Response class Zend_XmlRpc_Server_testRequest extends Zend_XmlRpc_Request { -} \ No newline at end of file +} diff --git a/tests/Zend/XmlRpc/ValueTest.php b/tests/Zend/XmlRpc/ValueTest.php index 9ca9dba2af..64ee0d5ca1 100644 --- a/tests/Zend/XmlRpc/ValueTest.php +++ b/tests/Zend/XmlRpc/ValueTest.php @@ -1,6 +1,6 @@ - - ./Zend/AllTests.php + ./Zend/AllTests.php diff --git a/tests/resources/AllTests.php b/tests/resources/AllTests.php index ab942d7f1b..aa0d6c8345 100644 --- a/tests/resources/AllTests.php +++ b/tests/resources/AllTests.php @@ -42,7 +42,7 @@ class resources_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -62,6 +62,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'resources_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'resources_AllTests::main') { resources_AllTests::main(); } diff --git a/tests/resources/Runner.php b/tests/resources/Runner.php new file mode 100644 index 0000000000..dd4fba49ec --- /dev/null +++ b/tests/resources/Runner.php @@ -0,0 +1,22 @@ +runner = new TestRunner(); + $this->runMethod = method_exists($this->runner, 'run') ? 'run' : 'doRun'; + } + + /** + * @return mixed ...$args + */ + public function run(...$args) + { + return $this->runner->{$this->runMethod}(...$args); + } +} diff --git a/tests/resources/languages/AllTests.php b/tests/resources/languages/AllTests.php index 7fe3b0d6f8..5d0e50016b 100644 --- a/tests/resources/languages/AllTests.php +++ b/tests/resources/languages/AllTests.php @@ -42,7 +42,7 @@ class resources_languages_AllTests { public static function main() { - (new TestRunner())->run(self::suite()); + (new resources_Runner())->run(self::suite()); } /** @@ -62,6 +62,6 @@ public static function suite() } } -if (PHPUnit_MAIN_METHOD == 'resources_languages_AllTests::main') { +if (PHPUnit_MAIN_METHOD === 'resources_languages_AllTests::main') { resources_languages_AllTests::main(); } diff --git a/tests/resources/languages/Zend_ValidateTest.php b/tests/resources/languages/Zend_ValidateTest.php index 6458c924fc..1a824ce859 100644 --- a/tests/resources/languages/Zend_ValidateTest.php +++ b/tests/resources/languages/Zend_ValidateTest.php @@ -1,6 +1,6 @@ _langDir = dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR . 'languages';