diff --git a/.travis.yml b/.travis.yml index abc18f1c..905480ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,6 @@ php: - 7.1 - hhvm -matrix: - allow_failures: - - hhvm - before_script: - composer self-update - composer install --no-interaction diff --git a/module/Core/config/routes.config.php b/module/Core/config/routes.config.php index 8e9ac66d..4d9a85e5 100644 --- a/module/Core/config/routes.config.php +++ b/module/Core/config/routes.config.php @@ -1,5 +1,5 @@ 'long-url-redirect', 'path' => '/{shortCode}', - 'middleware' => RedirectMiddleware::class, + 'middleware' => RedirectAction::class, 'allowed_methods' => ['GET'], ], ], diff --git a/module/Core/config/services.config.php b/module/Core/config/services.config.php index 00de6a67..7d044875 100644 --- a/module/Core/config/services.config.php +++ b/module/Core/config/services.config.php @@ -1,6 +1,6 @@ AnnotatedFactory::class, // Middleware - RedirectMiddleware::class => AnnotatedFactory::class, + RedirectAction::class => AnnotatedFactory::class, ], ], diff --git a/module/Core/src/Action/RedirectMiddleware.php b/module/Core/src/Action/RedirectAction.php similarity index 98% rename from module/Core/src/Action/RedirectMiddleware.php rename to module/Core/src/Action/RedirectAction.php index 1afd2d01..8f7e7042 100644 --- a/module/Core/src/Action/RedirectMiddleware.php +++ b/module/Core/src/Action/RedirectAction.php @@ -11,7 +11,7 @@ use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface; use Zend\Diactoros\Response\RedirectResponse; use Zend\Stratigility\MiddlewareInterface; -class RedirectMiddleware implements MiddlewareInterface +class RedirectAction implements MiddlewareInterface { /** * @var UrlShortenerInterface diff --git a/module/Rest/config/routes.config.php b/module/Rest/config/routes.config.php index 528e3011..4cc0f510 100644 --- a/module/Rest/config/routes.config.php +++ b/module/Rest/config/routes.config.php @@ -7,31 +7,31 @@ return [ [ 'name' => 'rest-authenticate', 'path' => '/rest/authenticate', - 'middleware' => Action\AuthenticateMiddleware::class, + 'middleware' => Action\AuthenticateAction::class, 'allowed_methods' => ['POST', 'OPTIONS'], ], [ 'name' => 'rest-create-shortcode', 'path' => '/rest/short-codes', - 'middleware' => Action\CreateShortcodeMiddleware::class, + 'middleware' => Action\CreateShortcodeAction::class, 'allowed_methods' => ['POST', 'OPTIONS'], ], [ 'name' => 'rest-resolve-url', 'path' => '/rest/short-codes/{shortCode}', - 'middleware' => Action\ResolveUrlMiddleware::class, + 'middleware' => Action\ResolveUrlAction::class, 'allowed_methods' => ['GET', 'OPTIONS'], ], [ 'name' => 'rest-list-shortened-url', 'path' => '/rest/short-codes', - 'middleware' => Action\ListShortcodesMiddleware::class, + 'middleware' => Action\ListShortcodesAction::class, 'allowed_methods' => ['GET'], ], [ 'name' => 'rest-get-visits', 'path' => '/rest/short-codes/{shortCode}/visits', - 'middleware' => Action\GetVisitsMiddleware::class, + 'middleware' => Action\GetVisitsAction::class, 'allowed_methods' => ['GET', 'OPTIONS'], ], ], diff --git a/module/Rest/config/services.config.php b/module/Rest/config/services.config.php index b2c77bc7..926368c3 100644 --- a/module/Rest/config/services.config.php +++ b/module/Rest/config/services.config.php @@ -11,11 +11,11 @@ return [ 'factories' => [ Service\RestTokenService::class => AnnotatedFactory::class, - Action\AuthenticateMiddleware::class => AnnotatedFactory::class, - Action\CreateShortcodeMiddleware::class => AnnotatedFactory::class, - Action\ResolveUrlMiddleware::class => AnnotatedFactory::class, - Action\GetVisitsMiddleware::class => AnnotatedFactory::class, - Action\ListShortcodesMiddleware::class => AnnotatedFactory::class, + Action\AuthenticateAction::class => AnnotatedFactory::class, + Action\CreateShortcodeAction::class => AnnotatedFactory::class, + Action\ResolveUrlAction::class => AnnotatedFactory::class, + Action\GetVisitsAction::class => AnnotatedFactory::class, + Action\ListShortcodesAction::class => AnnotatedFactory::class, Middleware\CrossDomainMiddleware::class => InvokableFactory::class, Middleware\CheckAuthenticationMiddleware::class => AnnotatedFactory::class, diff --git a/module/Rest/src/Action/AbstractRestMiddleware.php b/module/Rest/src/Action/AbstractRestAction.php similarity index 96% rename from module/Rest/src/Action/AbstractRestMiddleware.php rename to module/Rest/src/Action/AbstractRestAction.php index a273d248..587e1a93 100644 --- a/module/Rest/src/Action/AbstractRestMiddleware.php +++ b/module/Rest/src/Action/AbstractRestAction.php @@ -5,7 +5,7 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; use Zend\Stratigility\MiddlewareInterface; -abstract class AbstractRestMiddleware implements MiddlewareInterface +abstract class AbstractRestAction implements MiddlewareInterface { /** * Process an incoming request and/or response. diff --git a/module/Rest/src/Action/AuthenticateMiddleware.php b/module/Rest/src/Action/AuthenticateAction.php similarity index 95% rename from module/Rest/src/Action/AuthenticateMiddleware.php rename to module/Rest/src/Action/AuthenticateAction.php index 1a37ea90..7d564e4f 100644 --- a/module/Rest/src/Action/AuthenticateMiddleware.php +++ b/module/Rest/src/Action/AuthenticateAction.php @@ -11,7 +11,7 @@ use Shlinkio\Shlink\Rest\Util\RestUtils; use Zend\Diactoros\Response\JsonResponse; use Zend\I18n\Translator\TranslatorInterface; -class AuthenticateMiddleware extends AbstractRestMiddleware +class AuthenticateAction extends AbstractRestAction { /** * @var RestTokenServiceInterface @@ -23,7 +23,7 @@ class AuthenticateMiddleware extends AbstractRestMiddleware private $translator; /** - * AuthenticateMiddleware constructor. + * AuthenticateAction constructor. * @param RestTokenServiceInterface|RestTokenService $restTokenService * @param TranslatorInterface $translator * diff --git a/module/Rest/src/Action/CreateShortcodeMiddleware.php b/module/Rest/src/Action/CreateShortcodeAction.php similarity index 97% rename from module/Rest/src/Action/CreateShortcodeMiddleware.php rename to module/Rest/src/Action/CreateShortcodeAction.php index fe3074fa..29aa1108 100644 --- a/module/Rest/src/Action/CreateShortcodeMiddleware.php +++ b/module/Rest/src/Action/CreateShortcodeAction.php @@ -12,7 +12,7 @@ use Zend\Diactoros\Response\JsonResponse; use Zend\Diactoros\Uri; use Zend\I18n\Translator\TranslatorInterface; -class CreateShortcodeMiddleware extends AbstractRestMiddleware +class CreateShortcodeAction extends AbstractRestAction { /** * @var UrlShortener|UrlShortenerInterface diff --git a/module/Rest/src/Action/GetVisitsMiddleware.php b/module/Rest/src/Action/GetVisitsAction.php similarity index 96% rename from module/Rest/src/Action/GetVisitsMiddleware.php rename to module/Rest/src/Action/GetVisitsAction.php index 75765389..bd78adbb 100644 --- a/module/Rest/src/Action/GetVisitsMiddleware.php +++ b/module/Rest/src/Action/GetVisitsAction.php @@ -12,7 +12,7 @@ use Shlinkio\Shlink\Rest\Util\RestUtils; use Zend\Diactoros\Response\JsonResponse; use Zend\I18n\Translator\TranslatorInterface; -class GetVisitsMiddleware extends AbstractRestMiddleware +class GetVisitsAction extends AbstractRestAction { /** * @var VisitsTrackerInterface @@ -24,7 +24,7 @@ class GetVisitsMiddleware extends AbstractRestMiddleware private $translator; /** - * GetVisitsMiddleware constructor. + * GetVisitsAction constructor. * @param VisitsTrackerInterface|VisitsTracker $visitsTracker * @param TranslatorInterface $translator * diff --git a/module/Rest/src/Action/ListShortcodesMiddleware.php b/module/Rest/src/Action/ListShortcodesAction.php similarity index 94% rename from module/Rest/src/Action/ListShortcodesMiddleware.php rename to module/Rest/src/Action/ListShortcodesAction.php index 99b1c718..3d0d9613 100644 --- a/module/Rest/src/Action/ListShortcodesMiddleware.php +++ b/module/Rest/src/Action/ListShortcodesAction.php @@ -11,7 +11,7 @@ use Shlinkio\Shlink\Rest\Util\RestUtils; use Zend\Diactoros\Response\JsonResponse; use Zend\I18n\Translator\TranslatorInterface; -class ListShortcodesMiddleware extends AbstractRestMiddleware +class ListShortcodesAction extends AbstractRestAction { use PaginatorUtilsTrait; @@ -25,7 +25,7 @@ class ListShortcodesMiddleware extends AbstractRestMiddleware private $translator; /** - * ListShortcodesMiddleware constructor. + * ListShortcodesAction constructor. * @param ShortUrlServiceInterface|ShortUrlService $shortUrlService * @param TranslatorInterface $translator * diff --git a/module/Rest/src/Action/ResolveUrlMiddleware.php b/module/Rest/src/Action/ResolveUrlAction.php similarity index 96% rename from module/Rest/src/Action/ResolveUrlMiddleware.php rename to module/Rest/src/Action/ResolveUrlAction.php index db7e5827..c1783834 100644 --- a/module/Rest/src/Action/ResolveUrlMiddleware.php +++ b/module/Rest/src/Action/ResolveUrlAction.php @@ -11,7 +11,7 @@ use Shlinkio\Shlink\Rest\Util\RestUtils; use Zend\Diactoros\Response\JsonResponse; use Zend\I18n\Translator\TranslatorInterface; -class ResolveUrlMiddleware extends AbstractRestMiddleware +class ResolveUrlAction extends AbstractRestAction { /** * @var UrlShortenerInterface @@ -23,7 +23,7 @@ class ResolveUrlMiddleware extends AbstractRestMiddleware private $translator; /** - * ResolveUrlMiddleware constructor. + * ResolveUrlAction constructor. * @param UrlShortenerInterface|UrlShortener $urlShortener * @param TranslatorInterface $translator *