Snížena podpora PHP na 5.5+ + .gitignore

.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: Package CI
+
+on:
+  pull_request:
+
+jobs:
+  checks:
+    name: Checks
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [ 7.4, 8.0 ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - run: make composer
+
+      - if: matrix.php == '8.0'
+        run: make cs
+
+      - if: matrix.php == '8.0'
+        run: make phpstan
+
+      - run: make run-tests

.gitignore

@@ -0,0 +1,5 @@
+/composer.lock
+/vendor
+/tests/**/*.actual
+/tests/**/*.expected
+/tests/temp

Makefile

@@ -0,0 +1,13 @@
+composer:
+	composer validate
+	composer update --no-interaction --prefer-dist
+
+phpstan:
+	vendor/bin/phpstan analyse src/ -c phpstan.neon --level 8 --no-progress
+
+cs:
+	vendor/bin/phpcs src/ --standard=vendor/pd/coding-standard/src/PeckaCodingStandard/ruleset.xml
+	vendor/bin/phpcs src/ --standard=vendor/pd/coding-standard/src/PeckaCodingStandardStrict/ruleset.xml
+
+run-tests:
+	vendor/bin/tester -C tests/

composer.json

@@ -1,21 +1,40 @@
 {
-	"name": "vitkutny/version",
+	"name": "pd/version",
+	"description": "Filtr pro zjisštění verze obsahu URL",
 	"extra": {
 		"extensions": {
-			"vitkutny.version": "VitKutny\\Version\\Extension"
+			"pd.version": "Pd\\Version\\Extension"
 		}
 	},
 	"require": {
-		"php": "~7.0",
-		"nette/http": "~2.0"
+		"php": "^7.4 | ^8.0",
+		"nette/http": "^3.0",
+		"nette/caching": "^3.0",
+		"nette/application": "^3.0",
+		"symfony/console": "^3.0 | ^4.0 | ^5.0"
+	},
+	"require-dev": {
+		"pd/coding-standard": "v1.27.2",
+		"nette/tester": "^2.4",
+		"nette/bootstrap": "^3.0",
+		"phpstan/phpstan": "0.12.88",
+		"phpstan/phpstan-strict-rules": "0.12.9",
+		"latte/latte": "^2.9"
 	},
 	"suggest": {
 		"nette/caching": "Caching support",
-		"nette/di": "Register filter using extension"
+		"nette/di": "Register filter using extension",
+		"kdyby/console": "For Symfony Console support",
+		"contributte/console": "For Symfony Console support"
 	},
 	"autoload": {
 		"psr-4": {
-			"VitKutny\\": "src/"
+			"Pd\\Version\\": "src/"
 		}
+	},
+	"autoload-dev": {
+		"classmap": [
+			"tests/"
+		]
 	}
 }

phpstan.neon

@@ -0,0 +1,5 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '~^Parameter #2 \$(format|associative) of function get_headers expects (int|bool), int\|true given\.$~'
+			path: src/Resolvers/AbsoluteUrlResolver.php

src/CleanCacheCommand.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types = 1);
+
+namespace Pd\Version;
+
+final class CleanCacheCommand extends \Symfony\Component\Console\Command\Command
+{
+
+	protected function configure(): void
+	{
+		$this->setName('pd:version:clean-cache');
+		$this->setDescription('Smaže cache verzí');
+	}
+
+
+	protected function execute(
+		\Symfony\Component\Console\Input\InputInterface $input,
+		\Symfony\Component\Console\Output\OutputInterface $output
+	) {
+		/** @var \Nette\Caching\IStorage $storage */
+		$storage = $this->getHelper('container')->getByType(\Nette\Caching\IStorage::class);
+		$conditions = [
+			'tags' => [
+				Filter::CACHE_TAG,
+			],
+		];
+
+		if ($output->getVerbosity() > \Symfony\Component\Console\Output\Output::VERBOSITY_QUIET) {
+			$output->write('Smaže se cache verzí: ');
+		}
+
+		$storage->clean($conditions);
+
+		if ($output->getVerbosity() > \Symfony\Component\Console\Output\Output::VERBOSITY_QUIET) {
+			$output->writeln('<info>Smazáno</info>');
+		}
+
+		return 0;
+	}
+
+}

src/Extension.php

@@ -0,0 +1,105 @@
+<?php declare(strict_types = 1);
+
+namespace Pd\Version;
+
+final class Extension extends \Nette\DI\CompilerExtension
+{
+
+	private string $directory;
+
+	private string $parameter;
+
+	private bool $debugMode;
+
+
+	public function __construct(string $directory = '%wwwDir%', string $parameter = 'version', bool $debugMode = FALSE)
+	{
+		$this->directory = $directory;
+		$this->parameter = $parameter;
+		$this->debugMode = $debugMode;
+	}
+
+
+	public function beforeCompile(): void
+	{
+		$builder = $this->getContainerBuilder();
+		/** @var \Nette\DI\Definitions\ServiceDefinition $filter */
+		$filter = $builder->getDefinition($this->prefix('filter'));
+		/** @var \Nette\DI\Definitions\ServiceDefinition $absoluteUrlResolver */
+		$absoluteUrlResolver = $builder->getDefinition($this->prefix('absoluteUrlResolver'));
+		/** @var \Nette\DI\Definitions\ServiceDefinition $pathResolver */
+		$pathResolver = $builder->getDefinition($this->prefix('pathResolver'));
+
+		$request = $builder->getByType(\Nette\Http\IRequest::class);
+		if ($request) {
+			$absoluteUrlResolver->addSetup('setRequest', [$builder->getDefinition($request)]);
+			$pathResolver->addSetup('setRequest', [$builder->getDefinition($request)]);
+		}
+
+		$storage = $builder->getByType(\Nette\Caching\IStorage::class);
+		if ($storage) {
+			$absoluteUrlResolver->addSetup('setStorage', [
+				$builder->getDefinition($storage),
+			]);
+			$pathResolver->addSetup('setStorage', [
+				$builder->getDefinition($storage),
+			]);
+		}
+
+		$engine = $builder->getByType(\Nette\Bridges\ApplicationLatte\ILatteFactory::class);
+		if ($engine) {
+			/** @var \Nette\DI\Definitions\FactoryDefinition $latteEngine */
+			$latteEngine = $builder->getDefinition($engine);
+			$latteEngine->getResultDefinition()->addSetup('addFilter', [
+				'version',
+				$filter,
+			])
+			;
+		}
+	}
+
+
+	public function loadConfiguration(): void
+	{
+		$builder = $this->getContainerBuilder();
+
+		$absoluteUrlResolver = $builder->addDefinition($this->prefix('absoluteUrlResolver'))
+			->setFactory(\Pd\Version\Resolvers\AbsoluteUrlResolver::class)
+		;
+
+		$pathResolver = $builder->addDefinition($this->prefix('pathResolver'))
+			->setFactory(\Pd\Version\Resolvers\PathResolver::class)
+			->setArguments([$this->debugMode])
+		;
+
+		$arguments = [
+			$this->directory,
+			$this->parameter,
+			$absoluteUrlResolver,
+			$pathResolver,
+		];
+		$builder
+			->addDefinition($this->prefix('filter'))
+			->setFactory(Filter::class)
+			->setArguments($arguments)
+		;
+
+		$builder->addDefinition($this->prefix('relativePathGetter'))
+			->setFactory(\Pd\Version\Resolvers\Getter\RelativePathGetter::class)
+		;
+
+		if (\PHP_SAPI !== 'cli') {
+			return;
+		}
+		$builder = $this->getContainerBuilder();
+		$cleanCacheDefinition = $builder
+			->addDefinition($this->prefix('console.cleanCache'))
+			->setFactory(CleanCacheCommand::class)
+		;
+
+		if (\class_exists('\Kdyby\Console\DI\ConsoleExtension')) {
+			$cleanCacheDefinition->addTag('kdyby.console.command');
+		}
+	}
+
+}

src/Filter.php

@@ -0,0 +1,56 @@
+<?php declare(strict_types = 1);
+
+namespace Pd\Version;
+
+final class Filter implements IFilter
+{
+
+	public const CACHE_TAG = 'pd-version';
+
+
+	private string $directory;
+
+	private string $parameter;
+
+	/**
+	 * @var \Pd\Version\Resolvers\PathResolverInterface[]
+	 */
+	private array $getters;
+
+
+	public function __construct(
+		string $directory,
+		string $parameter,
+		\Pd\Version\Resolvers\PathResolverInterface ...$getters
+	)
+	{
+		$this->directory = $directory;
+		$this->parameter = $parameter;
+		$this->getters = $getters;
+	}
+
+
+	/**
+	 * @param string|\Nette\Http\Url|\Nette\Http\UrlImmutable $url
+	 */
+	public function __invoke(
+		$url,
+		?string $directory = NULL,
+		?string $parameter = NULL
+	): ?string
+	{
+		$directory = $directory ?: $this->directory;
+		$parameter = $parameter ?: $this->parameter;
+
+		$url = new \Nette\Http\Url($url);
+		foreach ($this->getters as $getter) {
+			$filePath = $getter->resolve($url, $directory, $parameter);
+			if ($filePath) {
+				return $filePath;
+			}
+		}
+
+		return NULL;
+	}
+
+}

src/IFilter.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types = 1);
+
+namespace Pd\Version;
+
+interface IFilter
+{
+
+	/**
+	 * @param string|\Nette\Http\Url|\Nette\Http\UrlImmutable $url
+	 */
+	public function __invoke(
+		$url,
+		?string $directory = NULL,
+		?string $parameter = NULL
+	): ?string;
+
+}

src/Resolvers/AbsoluteUrlResolver.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace Pd\Version\Resolvers;
+
+class AbsoluteUrlResolver extends \Pd\Version\Resolvers\AbstractPathResolver
+{
+
+	public function resolve(\Nette\Http\Url $url, string $directory, string $parameter): ?string
+	{
+		if ( ! $this->isAbsoluteUrl($url)) {
+			return NULL;
+		}
+
+		if ( ! $this->cache) {
+			return $this->process($url, $parameter);
+		}
+
+		return $this->cache->load([$url->path, $directory, $parameter], function () use ($url, $parameter): string {
+			return $this->process($url, $parameter);
+		});
+	}
+
+
+	private function process(\Nette\Http\Url $url, string $parameter): string
+	{
+		$version = '';
+		$headers = @\get_headers($url->getAbsoluteUrl(), \PHP_VERSION_ID >= 80000 ? TRUE : 1);
+		if (\is_array($headers) && isset($headers['ETag'])) {
+			$version = \preg_replace('~[^a-z0-9\-]~', '', $headers['ETag']);
+		} elseif (\is_array($headers) && isset($headers['Last-Modified'])) {
+			$version = (string) (new \DateTime($headers['Last-Modified']))->getTimestamp();
+		}
+
+		return $this->getPath($url, $version, $parameter);
+	}
+
+
+	private function isAbsoluteUrl(\Nette\Http\Url $url): bool
+	{
+		if ( ! \Nette\Utils\Strings::length($url->getHost())) {
+			return FALSE;
+		}
+
+		return $this->request && $url->getHost() !== $this->request->getUrl()->getHost();
+	}
+
+}