Made test properties to be private instead of protected

2025-03-14 04:00:57 +03:00 · 2018-11-20 19:37:22 +01:00 · 2018-11-20 19:37:22 +01:00 · 5abd9d1a40
commit 5abd9d1a40
parent 0ae5a53d86
51 changed files with 90 additions and 90 deletions
--- a/module/CLI/test/Command/Api/DisableKeyCommandTest.php
+++ b/module/CLI/test/Command/Api/DisableKeyCommandTest.php
@ -14,9 +14,9 @@ use Symfony\Component\Console\Tester\CommandTester;
 class DisableKeyCommandTest extends TestCase
 {
    /** @var CommandTester */
-    protected $commandTester;
+    private $commandTester;
    /** @var ObjectProphecy */
-    protected $apiKeyService;
+    private $apiKeyService;

    public function setUp()
    {
--- a/module/CLI/test/Command/Api/GenerateKeyCommandTest.php
+++ b/module/CLI/test/Command/Api/GenerateKeyCommandTest.php
@ -16,9 +16,9 @@ use Symfony\Component\Console\Tester\CommandTester;
 class GenerateKeyCommandTest extends TestCase
 {
    /** @var CommandTester */
-    protected $commandTester;
+    private $commandTester;
    /** @var ObjectProphecy */
-    protected $apiKeyService;
+    private $apiKeyService;

    public function setUp()
    {
--- a/module/CLI/test/Command/Api/ListKeysCommandTest.php
+++ b/module/CLI/test/Command/Api/ListKeysCommandTest.php
@ -14,9 +14,9 @@ use Symfony\Component\Console\Tester\CommandTester;
 class ListKeysCommandTest extends TestCase
 {
    /** @var CommandTester */
-    protected $commandTester;
+    private $commandTester;
    /** @var ObjectProphecy */
-    protected $apiKeyService;
+    private $apiKeyService;

    public function setUp()
    {
--- a/module/CLI/test/Command/Config/GenerateCharsetCommandTest.php
+++ b/module/CLI/test/Command/Config/GenerateCharsetCommandTest.php
@ -14,7 +14,7 @@ use function str_split;
 class GenerateCharsetCommandTest extends TestCase
 {
    /** @var CommandTester */
-    protected $commandTester;
+    private $commandTester;

    public function setUp()
    {
--- a/module/CLI/test/Command/ShortUrl/GeneratePreviewCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/GeneratePreviewCommandTest.php
@ -21,7 +21,7 @@ use function substr_count;
 class GeneratePreviewCommandTest extends TestCase
 {
    /** @var CommandTester */
-    protected $commandTester;
+    private $commandTester;
    /** @var ObjectProphecy */
    private $previewGenerator;
    /** @var ObjectProphecy */
--- a/module/CLI/test/Command/ShortUrl/GenerateShortUrlCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/GenerateShortUrlCommandTest.php
@ -18,9 +18,9 @@ use Symfony\Component\Console\Tester\CommandTester;
 class GenerateShortUrlCommandTest extends TestCase
 {
    /** @var CommandTester */
-    protected $commandTester;
+    private $commandTester;
    /** @var ObjectProphecy */
-    protected $urlShortener;
+    private $urlShortener;

    public function setUp()
    {
--- a/module/CLI/test/Command/ShortUrl/GetVisitsCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/GetVisitsCommandTest.php
@ -21,9 +21,9 @@ use function strpos;
 class GetVisitsCommandTest extends TestCase
 {
    /** @var CommandTester */
-    protected $commandTester;
+    private $commandTester;
    /** @var ObjectProphecy */
-    protected $visitsTracker;
+    private $visitsTracker;

    public function setUp()
    {
--- a/module/CLI/test/Command/ShortUrl/ListShortUrlsCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/ListShortUrlsCommandTest.php
@ -17,9 +17,9 @@ use Zend\Paginator\Paginator;
 class ListShortUrlsCommandTest extends TestCase
 {
    /** @var CommandTester */
-    protected $commandTester;
+    private $commandTester;
    /** @var ObjectProphecy */
-    protected $shortUrlService;
+    private $shortUrlService;

    public function setUp()
    {
--- a/module/CLI/test/Command/ShortUrl/ResolveUrlCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/ResolveUrlCommandTest.php
@ -17,9 +17,9 @@ use const PHP_EOL;
 class ResolveUrlCommandTest extends TestCase
 {
    /** @var CommandTester */
-    protected $commandTester;
+    private $commandTester;
    /** @var ObjectProphecy */
-    protected $urlShortener;
+    private $urlShortener;

    public function setUp()
    {
--- a/module/CLI/test/ConfigProviderTest.php
+++ b/module/CLI/test/ConfigProviderTest.php
@ -9,7 +9,7 @@ use Shlinkio\Shlink\CLI\ConfigProvider;
 class ConfigProviderTest extends TestCase
 {
    /** @var ConfigProvider */
-    protected $configProvider;
+    private $configProvider;

    public function setUp()
    {
--- a/module/CLI/test/Factory/ApplicationFactoryTest.php
+++ b/module/CLI/test/Factory/ApplicationFactoryTest.php
@ -16,7 +16,7 @@ use function array_merge;
 class ApplicationFactoryTest extends TestCase
 {
    /** @var ApplicationFactory */
-    protected $factory;
+    private $factory;

    public function setUp()
    {
--- a/module/Common/test/ConfigProviderTest.php
+++ b/module/Common/test/ConfigProviderTest.php
@ -9,7 +9,7 @@ use Shlinkio\Shlink\Common\ConfigProvider;
 class ConfigProviderTest extends TestCase
 {
    /** @var ConfigProvider */
-    protected $configProvider;
+    private $configProvider;

    public function setUp()
    {
--- a/module/Common/test/Factory/CacheFactoryTest.php
+++ b/module/Common/test/Factory/CacheFactoryTest.php
@ -20,7 +20,7 @@ use function sys_get_temp_dir;
 class CacheFactoryTest extends TestCase
 {
    /** @var CacheFactory */
-    protected $factory;
+    private $factory;

    public function setUp()
    {
--- a/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php
+++ b/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php
@ -13,7 +13,7 @@ use Zend\ServiceManager\ServiceManager;
 class EmptyResponseImplicitOptionsMiddlewareFactoryTest extends TestCase
 {
    /** @var EmptyResponseImplicitOptionsMiddlewareFactory */
-    protected $factory;
+    private $factory;

    public function setUp()
    {
--- a/module/Common/test/Factory/EntityManagerFactoryTest.php
+++ b/module/Common/test/Factory/EntityManagerFactoryTest.php
@ -11,7 +11,7 @@ use Zend\ServiceManager\ServiceManager;
 class EntityManagerFactoryTest extends TestCase
 {
    /** @var EntityManagerFactory */
-    protected $factory;
+    private $factory;

    public function setUp()
    {
--- a/module/Common/test/Factory/LoggerFactoryTest.php
+++ b/module/Common/test/Factory/LoggerFactoryTest.php
@ -12,7 +12,7 @@ use Zend\ServiceManager\ServiceManager;
 class LoggerFactoryTest extends TestCase
 {
    /** @var LoggerFactory */
-    protected $factory;
+    private $factory;

    public function setUp()
    {
--- a/module/Common/test/Factory/TranslatorFactoryTest.php
+++ b/module/Common/test/Factory/TranslatorFactoryTest.php
@ -11,7 +11,7 @@ use Zend\ServiceManager\ServiceManager;
 class TranslatorFactoryTest extends TestCase
 {
    /** @var TranslatorFactory */
-    protected $factory;
+    private $factory;

    public function setUp()
    {
--- a/module/Common/test/Image/ImageBuilderFactoryTest.php
+++ b/module/Common/test/Image/ImageBuilderFactoryTest.php
@ -11,7 +11,7 @@ use Zend\ServiceManager\ServiceManager;
 class ImageBuilderFactoryTest extends TestCase
 {
    /** @var ImageBuilderFactory */
-    protected $factory;
+    private $factory;

    public function setUp()
    {
--- a/module/Common/test/Image/ImageFactoryTest.php
+++ b/module/Common/test/Image/ImageFactoryTest.php
@ -12,7 +12,7 @@ use Zend\ServiceManager\ServiceManager;
 class ImageFactoryTest extends TestCase
 {
    /** @var ImageFactory */
-    protected $factory;
+    private $factory;

    public function setUp()
    {
--- a/module/Common/test/IpGeolocation/IpApiLocationResolverTest.php
+++ b/module/Common/test/IpGeolocation/IpApiLocationResolverTest.php
@ -14,9 +14,9 @@ use function json_encode;
 class IpApiLocationResolverTest extends TestCase
 {
    /** @var IpApiLocationResolver */
-    protected $ipResolver;
+    private $ipResolver;
    /** @var ObjectProphecy */
-    protected $client;
+    private $client;

    public function setUp()
    {
--- a/module/Common/test/Middleware/LocaleMiddlewareTest.php
+++ b/module/Common/test/Middleware/LocaleMiddlewareTest.php
@ -12,9 +12,9 @@ use Zend\I18n\Translator\Translator;
 class LocaleMiddlewareTest extends TestCase
 {
    /** @var LocaleMiddleware */
-    protected $middleware;
+    private $middleware;
    /** @var Translator */
-    protected $translator;
+    private $translator;

    public function setUp()
    {
--- a/module/Common/test/Paginator/PaginableRepositoryAdapterTest.php
+++ b/module/Common/test/Paginator/PaginableRepositoryAdapterTest.php
@ -11,9 +11,9 @@ use Shlinkio\Shlink\Common\Repository\PaginableRepositoryInterface;
 class PaginableRepositoryAdapterTest extends TestCase
 {
    /** @var PaginableRepositoryAdapter */
-    protected $adapter;
+    private $adapter;
    /** @var ObjectProphecy */
-    protected $repo;
+    private $repo;

    public function setUp()
    {
--- a/module/Common/test/Service/PreviewGeneratorTest.php
+++ b/module/Common/test/Service/PreviewGeneratorTest.php
@ -17,11 +17,11 @@ use function urlencode;
 class PreviewGeneratorTest extends TestCase
 {
    /** @var PreviewGenerator */
-    protected $generator;
+    private $generator;
    /** @var ObjectProphecy */
-    protected $image;
+    private $image;
    /** @var ObjectProphecy */
-    protected $filesystem;
+    private $filesystem;

    public function setUp()
    {
--- a/module/Common/test/Template/Extension/TranslatorExtensionTest.php
+++ b/module/Common/test/Template/Extension/TranslatorExtensionTest.php
@ -12,7 +12,7 @@ use Zend\I18n\Translator\Translator;
 class TranslatorExtensionTest extends TestCase
 {
    /** @var TranslatorExtension */
-    protected $extension;
+    private $extension;

    public function setUp()
    {
--- a/module/Core/src/Options/AppOptions.php
+++ b/module/Core/src/Options/AppOptions.php
@ -12,13 +12,13 @@ class AppOptions extends AbstractOptions
    use StringUtilsTrait;

    /** @var string */
-    protected $name = '';
+    private $name = '';
    /** @var string */
-    protected $version = '1.0';
+    private $version = '1.0';
    /** @var string */
-    protected $secretKey = '';
+    private $secretKey = '';
    /** @var string|null */
-    protected $disableTrackParam;
+    private $disableTrackParam;

    /**
     * AppOptions constructor.
--- a/module/Core/test/Action/PixelActionTest.php
+++ b/module/Core/test/Action/PixelActionTest.php
@ -19,11 +19,11 @@ use Zend\Diactoros\ServerRequestFactory;
 class PixelActionTest extends TestCase
 {
    /** @var RedirectAction */
-    protected $action;
+    private $action;
    /** @var ObjectProphecy */
-    protected $urlShortener;
+    private $urlShortener;
    /** @var ObjectProphecy */
-    protected $visitTracker;
+    private $visitTracker;

    public function setUp()
    {
--- a/module/Core/test/Action/PreviewActionTest.php
+++ b/module/Core/test/Action/PreviewActionTest.php
@ -24,7 +24,7 @@ use function filesize;
 class PreviewActionTest extends TestCase
 {
    /** @var PreviewAction */
-    protected $action;
+    private $action;
    /** @var ObjectProphecy */
    private $previewGenerator;
    /** @var ObjectProphecy */
--- a/module/Core/test/Action/QrCodeActionTest.php
+++ b/module/Core/test/Action/QrCodeActionTest.php
@ -21,9 +21,9 @@ use Zend\Expressive\Router\RouterInterface;
 class QrCodeActionTest extends TestCase
 {
    /** @var QrCodeAction */
-    protected $action;
+    private $action;
    /** @var ObjectProphecy */
-    protected $urlShortener;
+    private $urlShortener;

    public function setUp()
    {
--- a/module/Core/test/ConfigProviderTest.php
+++ b/module/Core/test/ConfigProviderTest.php
@ -9,7 +9,7 @@ use Shlinkio\Shlink\Core\ConfigProvider;
 class ConfigProviderTest extends TestCase
 {
    /** @var ConfigProvider */
-    protected $configProvider;
+    private $configProvider;

    public function setUp()
    {
--- a/module/Core/test/Middleware/QrCodeCacheMiddlewareTest.php
+++ b/module/Core/test/Middleware/QrCodeCacheMiddlewareTest.php
@ -16,9 +16,9 @@ use Zend\Diactoros\Uri;
 class QrCodeCacheMiddlewareTest extends TestCase
 {
    /** @var QrCodeCacheMiddleware */
-    protected $middleware;
+    private $middleware;
    /** @var Cache */
-    protected $cache;
+    private $cache;

    public function setUp()
    {
--- a/module/Core/test/Service/ShortUrlServiceTest.php
+++ b/module/Core/test/Service/ShortUrlServiceTest.php
@ -20,9 +20,9 @@ use function count;
 class ShortUrlServiceTest extends TestCase
 {
    /** @var ShortUrlService */
-    protected $service;
+    private $service;
    /** @var ObjectProphecy|EntityManagerInterface */
-    protected $em;
+    private $em;

    public function setUp()
    {
--- a/module/Core/test/Service/UrlShortenerTest.php
+++ b/module/Core/test/Service/UrlShortenerTest.php
@ -24,13 +24,13 @@ use Zend\Diactoros\Uri;
 class UrlShortenerTest extends TestCase
 {
    /** @var UrlShortener */
-    protected $urlShortener;
+    private $urlShortener;
    /** @var ObjectProphecy */
-    protected $em;
+    private $em;
    /** @var ObjectProphecy */
-    protected $httpClient;
+    private $httpClient;
    /** @var ObjectProphecy */
-    protected $slugger;
+    private $slugger;

    public function setUp()
    {
--- a/module/Core/test/Service/VisitServiceTest.php
+++ b/module/Core/test/Service/VisitServiceTest.php
@ -21,9 +21,9 @@ use function func_get_args;
 class VisitServiceTest extends TestCase
 {
    /** @var VisitService */
-    protected $visitService;
+    private $visitService;
    /** @var ObjectProphecy */
-    protected $em;
+    private $em;

    public function setUp()
    {
--- a/module/Core/test/Service/VisitsTrackerTest.php
+++ b/module/Core/test/Service/VisitsTrackerTest.php
@ -17,9 +17,9 @@ use Shlinkio\Shlink\Core\Service\VisitsTracker;
 class VisitsTrackerTest extends TestCase
 {
    /** @var VisitsTracker */
-    protected $visitsTracker;
+    private $visitsTracker;
    /** @var ObjectProphecy */
-    protected $em;
+    private $em;

    public function setUp()
    {
--- a/module/Installer/test/Command/InstallCommandTest.php
+++ b/module/Installer/test/Command/InstallCommandTest.php
@ -23,13 +23,13 @@ use Zend\Config\Writer\WriterInterface;
 class InstallCommandTest extends TestCase
 {
    /** @var InstallCommand */
-    protected $command;
+    private $command;
    /** @var CommandTester */
-    protected $commandTester;
+    private $commandTester;
    /** @var ObjectProphecy */
-    protected $configWriter;
+    private $configWriter;
    /** @var ObjectProphecy */
-    protected $filesystem;
+    private $filesystem;

    public function setUp()
    {
--- a/module/Installer/test/Config/Plugin/LanguageConfigCustomizerTest.php
+++ b/module/Installer/test/Config/Plugin/LanguageConfigCustomizerTest.php
@ -13,9 +13,9 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 class LanguageConfigCustomizerTest extends TestCase
 {
    /** @var LanguageConfigCustomizer */
-    protected $plugin;
+    private $plugin;
    /** @var ObjectProphecy */
-    protected $io;
+    private $io;

    public function setUp()
    {
--- a/module/Installer/test/ConfigProviderTest.php
+++ b/module/Installer/test/ConfigProviderTest.php
@ -9,7 +9,7 @@ use Shlinkio\Shlink\Installer\ConfigProvider;
 class ConfigProviderTest extends TestCase
 {
    /** @var ConfigProvider */
-    protected $configProvider;
+    private $configProvider;

    public function setUp()
    {
--- a/module/Rest/test/Action/AuthenticateActionTest.php
+++ b/module/Rest/test/Action/AuthenticateActionTest.php
@ -16,11 +16,11 @@ use function strpos;
 class AuthenticateActionTest extends TestCase
 {
    /** @var AuthenticateAction */
-    protected $action;
+    private $action;
    /** @var ObjectProphecy */
-    protected $apiKeyService;
+    private $apiKeyService;
    /** @var ObjectProphecy */
-    protected $jwtService;
+    private $jwtService;

    public function setUp()
    {
--- a/module/Rest/test/Action/ShortUrl/CreateShortUrlActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/CreateShortUrlActionTest.php
@ -20,9 +20,9 @@ use function strpos;
 class CreateShortUrlActionTest extends TestCase
 {
    /** @var CreateShortUrlAction */
-    protected $action;
+    private $action;
    /** @var ObjectProphecy */
-    protected $urlShortener;
+    private $urlShortener;

    public function setUp()
    {
--- a/module/Rest/test/Action/ShortUrl/EditShortUrlTagsActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/EditShortUrlTagsActionTest.php
@ -14,7 +14,7 @@ use Zend\Diactoros\ServerRequestFactory;
 class EditShortUrlTagsActionTest extends TestCase
 {
    /** @var EditShortUrlTagsAction */
-    protected $action;
+    private $action;
    /** @var ObjectProphecy */
    private $shortUrlService;

--- a/module/Rest/test/Action/ShortUrl/ListShortUrlsActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/ListShortUrlsActionTest.php
@ -15,9 +15,9 @@ use Zend\Paginator\Paginator;
 class ListShortUrlsActionTest extends TestCase
 {
    /** @var ListShortUrlsAction */
-    protected $action;
+    private $action;
    /** @var ObjectProphecy */
-    protected $service;
+    private $service;

    public function setUp()
    {
--- a/module/Rest/test/Action/ShortUrl/ResolveShortUrlActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/ResolveShortUrlActionTest.php
@ -18,9 +18,9 @@ use function strpos;
 class ResolveShortUrlActionTest extends TestCase
 {
    /** @var ResolveShortUrlAction */
-    protected $action;
+    private $action;
    /** @var ObjectProphecy */
-    protected $urlShortener;
+    private $urlShortener;

    public function setUp()
    {
--- a/module/Rest/test/Action/Visit/GetVisitsActionTest.php
+++ b/module/Rest/test/Action/Visit/GetVisitsActionTest.php
@ -17,9 +17,9 @@ use Zend\Diactoros\ServerRequestFactory;
 class GetVisitsActionTest extends TestCase
 {
    /** @var GetVisitsAction */
-    protected $action;
+    private $action;
    /** @var ObjectProphecy */
-    protected $visitsTracker;
+    private $visitsTracker;

    public function setUp()
    {
--- a/module/Rest/test/Authentication/JWTServiceTest.php
+++ b/module/Rest/test/Authentication/JWTServiceTest.php
@ -13,7 +13,7 @@ use function time;
 class JWTServiceTest extends TestCase
 {
    /** @var JWTService */
-    protected $service;
+    private $service;

    public function setUp()
    {
--- a/module/Rest/test/Authentication/Plugin/AuthorizationHeaderPluginTest.php
+++ b/module/Rest/test/Authentication/Plugin/AuthorizationHeaderPluginTest.php
@ -17,7 +17,7 @@ class AuthorizationHeaderPluginTest extends TestCase
    /** @var AuthorizationHeaderPlugin */
    private $plugin;
    /** @var ObjectProphecy */
-    protected $jwtService;
+    private $jwtService;

    public function setUp()
    {
--- a/module/Rest/test/ConfigProviderTest.php
+++ b/module/Rest/test/ConfigProviderTest.php
@ -9,7 +9,7 @@ use Shlinkio\Shlink\Rest\ConfigProvider;
 class ConfigProviderTest extends TestCase
 {
    /** @var ConfigProvider */
-    protected $configProvider;
+    private $configProvider;

    public function setUp()
    {
--- a/module/Rest/test/ErrorHandler/JsonErrorResponseGeneratorTest.php
+++ b/module/Rest/test/ErrorHandler/JsonErrorResponseGeneratorTest.php
@ -11,7 +11,7 @@ use Zend\Diactoros\ServerRequestFactory;
 class JsonErrorResponseGeneratorTest extends TestCase
 {
    /** @var JsonErrorResponseGenerator */
-    protected $errorHandler;
+    private $errorHandler;

    public function setUp()
    {
--- a/module/Rest/test/Middleware/AuthenticationMiddlewareTest.php
+++ b/module/Rest/test/Middleware/AuthenticationMiddlewareTest.php
@ -32,12 +32,12 @@ use function Zend\Stratigility\middleware;
 class AuthenticationMiddlewareTest extends TestCase
 {
    /** @var AuthenticationMiddleware */
-    protected $middleware;
+    private $middleware;
    /** @var ObjectProphecy */
-    protected $requestToPlugin;
+    private $requestToPlugin;

    /** @var callable */
-    protected $dummyMiddleware;
+    private $dummyMiddleware;

    public function setUp()
    {
--- a/module/Rest/test/Middleware/CrossDomainMiddlewareTest.php
+++ b/module/Rest/test/Middleware/CrossDomainMiddlewareTest.php
@ -14,9 +14,9 @@ use Zend\Diactoros\ServerRequestFactory;
 class CrossDomainMiddlewareTest extends TestCase
 {
    /** @var CrossDomainMiddleware */
-    protected $middleware;
+    private $middleware;
    /** @var ObjectProphecy */
-    protected $delegate;
+    private $delegate;

    public function setUp()
    {
--- a/module/Rest/test/Middleware/PathVersionMiddlewareTest.php
+++ b/module/Rest/test/Middleware/PathVersionMiddlewareTest.php
@ -17,7 +17,7 @@ use function array_shift;
 class PathVersionMiddlewareTest extends TestCase
 {
    /** @var PathVersionMiddleware */
-    protected $middleware;
+    private $middleware;

    public function setUp()
    {
--- a/module/Rest/test/Service/ApiKeyServiceTest.php
+++ b/module/Rest/test/Service/ApiKeyServiceTest.php
@ -15,9 +15,9 @@ use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 class ApiKeyServiceTest extends TestCase
 {
    /** @var ApiKeyService */
-    protected $service;
+    private $service;
    /** @var ObjectProphecy */
-    protected $em;
+    private $em;

    public function setUp()
    {