diff --git a/.gitignore b/.gitignore index cab49048..b67a9030 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ .idea -*.ben -*.txt node_modules dist .vscode diff --git a/Sources/composer.json b/Sources/composer.json index 72979bf7..f60dc811 100755 --- a/Sources/composer.json +++ b/Sources/composer.json @@ -3,19 +3,34 @@ "autoload": { "psr-4": { "Hearttrack\\": "src/", - "Console\\":"src/Console" + "Console\\": "src/console", + "App\\": "src/app", + "App\\Router\\": "src/app/router", + "App\\Controller\\": "src/app/controller", + "App\\Router\\Response\\" : "src/app/router/response", + "App\\Router\\Middleware\\" : "src/app/router/middleware", + "App\\Router\\Request\\" : "src/app/router/request", + "Shared\\": "src/shared/", + "Shared\\Exception\\": "src/shared/exception", + "Shared\\Attributes\\": "src/shared/attributes", + "App\\Views\\Directives\\" : "src/app/views/directives" + + } }, "require": { - "twig/twig": "^3.0" + "twig/twig": "^3.0", + "altorouter/altorouter": "1.1.0", + "vlucas/phpdotenv": "^5.5", + "psr/container": "^2.0" + }, "require-dev": { "phpunit/phpunit": "*" }, "scripts": { "dev": "php -S localhost:8080 -t public -d display_errors=1 -d error_reporting=E_ALL", - "dev:console": "export APP_ENV=console && php public/index.php" - - } - + "dev:console": "export APP_ENV=console && php public/index.php", + "dev:html" : "export APP_ENV=html && php -S localhost:8080 -t public -d display_errors=1 -d error_reporting=E_ALL" + } } diff --git a/Sources/composer.lock b/Sources/composer.lock index bfd52d0b..42ce6584 100755 --- a/Sources/composer.lock +++ b/Sources/composer.lock @@ -4,8 +4,253 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b084bad56d99d613841073027e5f5e7e", + "content-hash": "c8acec96dcc23612616eedff9886528e", "packages": [ + { + "name": "altorouter/altorouter", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/dannyvankooten/AltoRouter.git", + "reference": "09d9d946c546bae6d22a7654cdb3b825ffda54b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dannyvankooten/AltoRouter/zipball/09d9d946c546bae6d22a7654cdb3b825ffda54b4", + "reference": "09d9d946c546bae6d22a7654cdb3b825ffda54b4", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "AltoRouter.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Danny van Kooten", + "email": "dannyvankooten@gmail.com", + "homepage": "http://dannyvankooten.com/" + }, + { + "name": "Koen Punt", + "homepage": "https://github.com/koenpunt" + }, + { + "name": "niahoo", + "homepage": "https://github.com/niahoo" + } + ], + "description": "A lightning fast router for PHP", + "homepage": "https://github.com/dannyvankooten/AltoRouter", + "keywords": [ + "lightweight", + "router", + "routing" + ], + "support": { + "issues": "https://github.com/dannyvankooten/AltoRouter/issues", + "source": "https://github.com/dannyvankooten/AltoRouter/tree/master" + }, + "time": "2014-04-16T09:44:40+00:00" + }, + { + "name": "graham-campbell/result-type", + "version": "v1.1.2", + "source": { + "type": "git", + "url": "https://github.com/GrahamCampbell/Result-Type.git", + "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862", + "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "GrahamCampbell\\ResultType\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + } + ], + "description": "An Implementation Of The Result Type", + "keywords": [ + "Graham Campbell", + "GrahamCampbell", + "Result Type", + "Result-Type", + "result" + ], + "support": { + "issues": "https://github.com/GrahamCampbell/Result-Type/issues", + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type", + "type": "tidelift" + } + ], + "time": "2023-11-12T22:16:48+00:00" + }, + { + "name": "phpoption/phpoption", + "version": "1.9.2", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820", + "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpOption\\": "src/PhpOption/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh" + }, + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + } + ], + "description": "Option Type for PHP", + "keywords": [ + "language", + "option", + "php", + "type" + ], + "support": { + "issues": "https://github.com/schmittjoh/php-option/issues", + "source": "https://github.com/schmittjoh/php-option/tree/1.9.2" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], + "time": "2023-11-12T21:59:55+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, { "name": "symfony/polyfill-ctype", "version": "v1.28.0", @@ -171,28 +416,112 @@ ], "time": "2023-07-28T09:04:16+00:00" }, + { + "name": "symfony/polyfill-php80", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-26T09:26:14+00:00" + }, { "name": "twig/twig", - "version": "v3.7.1", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554" + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", - "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3" + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php80": "^1.22" }, "require-dev": { "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3" + "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" }, "type": "library", "autoload": { @@ -228,7 +557,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.7.1" + "source": "https://github.com/twigphp/Twig/tree/v3.8.0" }, "funding": [ { @@ -240,7 +569,91 @@ "type": "tidelift" } ], - "time": "2023-08-28T11:09:02+00:00" + "time": "2023-11-21T18:54:41+00:00" + }, + { + "name": "vlucas/phpdotenv", + "version": "v5.6.0", + "source": { + "type": "git", + "url": "https://github.com/vlucas/phpdotenv.git", + "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", + "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", + "shasum": "" + }, + "require": { + "ext-pcre": "*", + "graham-campbell/result-type": "^1.1.2", + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9.2", + "symfony/polyfill-ctype": "^1.24", + "symfony/polyfill-mbstring": "^1.24", + "symfony/polyfill-php80": "^1.24" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "ext-filter": "*", + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + }, + "suggest": { + "ext-filter": "Required to use the boolean validator." + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, + "branch-alias": { + "dev-master": "5.6-dev" + } + }, + "autoload": { + "psr-4": { + "Dotenv\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Vance Lucas", + "email": "vance@vancelucas.com", + "homepage": "https://github.com/vlucas" + } + ], + "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", + "keywords": [ + "dotenv", + "env", + "environment" + ], + "support": { + "issues": "https://github.com/vlucas/phpdotenv/issues", + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], + "time": "2023-11-12T22:43:29+00:00" } ], "packages-dev": [ @@ -1928,16 +2341,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -1966,7 +2379,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -1974,7 +2387,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" } ], "aliases": [], diff --git a/Sources/config/config.php b/Sources/config/config.php index 24a01547..080b042c 100755 --- a/Sources/config/config.php +++ b/Sources/config/config.php @@ -1,16 +1,20 @@ safeLoad(); +// apenrently getEnv is not a good thing cause // const DB_HOST = $_ENV['DB_HOST'] ?? 'localhost'; // const DB_DATABASE = $_ENV['DB_DATABASE'] ?? 'heartTrack'; // const DB_USER = $_ENV['DB_USER'] ?? 'toto'; // const DB_PASSWORD = $_ENV['DB_PASSWORD'] ?? 'achanger'; -// const APP_ENV = $_ENV['APP_ENV'] ?? 'development'; -const DB_HOST ='localhost'; -const DB_DATABASE = 'heartTrack'; +define("APP_ENV", getenv('APP_ENV') ?? 'development'); + +const DB_HOST = 'localhost'; +const DB_DATABASE = 'heartTrack'; const DB_USER = 'toto'; -const DB_PASSWORD = 'achanger'; -const APP_ENV = 'development'; +const DB_PASSWORD = 'achanger'; const DSN = "mysql:host=" . DB_HOST . ";dbname=" . DB_DATABASE; diff --git a/Sources/public/index.php b/Sources/public/index.php index 0a70f945..d38ebc5b 100755 --- a/Sources/public/index.php +++ b/Sources/public/index.php @@ -1,9 +1,36 @@ registerService(IArgumentResolver::class, ArgumentControllerResolver::class); + +$appFactory->registerService(\Twig\Loader\LoaderInterface::class, function() { + return new FilesystemLoader(__DIR__ . '/../src/app/views/Templates'); +}); + +$appFactory->registerService(\Twig\Environment::class,\Twig\Environment::class); + +// Connexion à la base de données +// $databaseContext = DatabaseContext::getInstance(); + +$appFactory->AddControllers(); +$app = $appFactory->create(); +if (!is_null($app)){ + // Ajout des Middleware + /*$app->use(new LoggingMiddleware());*/ + + $app->mapControllers(); + $app->run(RequestFactory::createFromGlobals()); } + diff --git a/Sources/src/app/App.php b/Sources/src/app/App.php new file mode 100644 index 00000000..c80e71f3 --- /dev/null +++ b/Sources/src/app/App.php @@ -0,0 +1,158 @@ +appName = $appName; + $this->version = $version; + $this->container = $diContainer; + $this->router = new Router(""); + $this->frontController = new FrontController($this->router,$this->container); + } + + public function use(IHttpMiddleware $middleware) + { + if ($this->middlewarePipeline === null) { + $this->middlewarePipeline = $middleware; + } else { + // Chain the new middleware to the end of the existing pipeline + $currentMiddleware = $this->middlewarePipeline; + while ($currentMiddleware->getNext() !== null) { + $currentMiddleware = $currentMiddleware->getNext(); + } + $currentMiddleware->setNext($middleware); + } + } + + public function getAppName(): string + { + return $this->appName; + } + +/* public function twigConfigure(array $extensionClassNames = []): void + { + if (!$this->container->has(\Twig\Environment::class)) { + throw new \LogicException('You cannot use the "twigConfigure" method if the Twig Bundle is not available. Try running "composer require twig/twig".'); + } + + $twigEnvironment = $this->container->get(\Twig\Environment::class); + + if (empty($extensionClassNames)) { + $twigEnvironment->addExtension(new Navigate($this->router)); + + } else { + foreach ($extensionClassNames as $extensionClassName) { + if (class_exists($extensionClassName)) { + $extensionInstance = new $extensionClassName(); + if ($extensionInstance instanceof \Twig\Extension\ExtensionInterface) { + $twigEnvironment->addExtension($extensionInstance); + } else { + throw new \InvalidArgumentException("Class '$extensionClassName' does not implement Twig\Extension\ExtensionInterface."); + } + } else { + throw new \InvalidArgumentException("Class '$extensionClassName' does not exist."); + } + } + } + }*/ + + + + public function getVersion(): int + { + return $this->version; + } + + public function run(IRequest $request) + { + if ($this->middlewarePipeline == null) { + return $this->frontController->dispatch($request); + } + // Exécutez le middleware en utilisant le pipeline + return $this->middlewarePipeline->handle($request, function($request) { + // Logique de gestion principale de la requête ici + $this->frontController->dispatch($request); + }); + + } + + /** + * @throws \ReflectionException + */ + public function mapControllers(): void + { + $classes = $this->container->getAllRegisteredClassNames(); + + foreach ($classes as $class) { + if ($this->isController($class)) { + $this->mapControllerRoutes($class); + } + } + } + /** + * @throws \ReflectionException + */ + function mapControllerRoutes(string $controllerClass): void + { + $reflectionClass = new \ReflectionClass($controllerClass); + $attributes = $reflectionClass->getAttributes(RouteAttribute::class); + $prefix = ''; + if (!empty($attributes)) { + + $prefix = $attributes[0]->newInstance()->getPath(); + } + + foreach ($reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) { + + foreach ($method->getAttributes(RouteAttribute::class) as $attribute) { + + /** @var RouteAttribute $route */ + $route = $attribute->newInstance(); + + $this->router->addControllerRoute( + implode('|', $route->getMethods()), + $prefix . $route->getPath(), + $controllerClass, + $method->getName(), + $route->getName() + ); + } + } + } + + + function isController(string $class): bool + { + $reflectionClass = new \ReflectionClass($class); + return $reflectionClass->isSubclassOf(BaseController::class); + } +} + diff --git a/Sources/src/app/AppCreator.php b/Sources/src/app/AppCreator.php new file mode 100644 index 00000000..d2ac0de6 --- /dev/null +++ b/Sources/src/app/AppCreator.php @@ -0,0 +1,91 @@ +container = new Container; + } + + public function registerService(string $serviceId, callable|string $service): self + { + $this->container->set($serviceId, $service); + $this->services[] = $serviceId; + return $this; + } + + /** + * Create an instance or perform actions based on the current application environment. + * + * @return App|null An instance of the App class in the 'development' environment, or null in other environments. + */ + public function create(): ?App + { + // Check the application environment + switch (APP_ENV) { + case 'console': + // Load the Console.php file in case of the 'console' environment + require_once __DIR__ . '/../console/Console.php'; + break; + case 'development': + // Create a new instance of the App class in the 'development' environment + return new App("HeartTrack", 1, $this->container); + break; + case 'html': + // Load the index.test.php file in case of the 'html' environment + require_once __DIR__ . '/index.test.php'; + break; + default: + // Handle other environment cases here, if necessary + break; + } + return null; + } + + + + function AddControllers($namespacePrefix = 'App\Controller', $pathToControllers = __DIR__ . '/controller'): self + { + $controllerFiles = glob($pathToControllers . '/*.php'); + + foreach ($controllerFiles as $file) { + // Get class name from file name + $class = basename($file, '.php'); + $fullClassName = $namespacePrefix . '\\' . $class; + if (!class_exists($fullClassName)) { + continue; + } + + // Use reflection to check if class extends BaseController + $reflectionClass = new \ReflectionClass($fullClassName); + if ($reflectionClass->isSubclassOf(BaseController::class)) { + // Register in DI container + $this->container->set($fullClassName, function () use ($fullClassName) { + $controllerInstance = new $fullClassName(); + $controllerInstance->setContainer($this->container); + return $controllerInstance; + }); + + } + } + + return $this; + } + + public function getServiceRegistered(): array + { + return $this->services; + } +} + + diff --git a/Sources/src/app/Container.php b/Sources/src/app/Container.php new file mode 100644 index 00000000..b254271f --- /dev/null +++ b/Sources/src/app/Container.php @@ -0,0 +1,109 @@ +has($id)) { + $entry = $this->entries[$id]; + if (is_callable($entry)) { + + return $entry($this); + } + + $id = $entry; + } + + return $this->resolve($id); + } + + + public function has(string $id): bool + { + return isset($this->entries[$id]); + } + + public function set(string $id, callable|string $concrete): void + { + $this->entries[$id] = $concrete; + + } + + public function resolve(string $id) + { + // 1. Inspect the class that we are trying to get from the container + try { + $reflectionClass = new \ReflectionClass($id); + } catch (\ReflectionException $e) { + throw new \Exception($e->getMessage(), $e->getCode(), $e); + } + if (!$reflectionClass->isInstantiable()) { + throw new \Exception('Class "' . $id . '" is not instantiable'); + } + + // 2. Inspect the constructor of the class + $constructor = $reflectionClass->getConstructor(); + + if (!$constructor) { + return new $id; + } + + // 3. Inspect the constructor parameters (dependencies) + $parameters = $constructor->getParameters(); + + if (!$parameters) { + return new $id; + } + + // 4. If the constructor parameter is a class then try to resolve that class using the container + $dependencies = array_map( + function (\ReflectionParameter $param) use ($id) { + $name = $param->getName(); + $type = $param->getType(); + + // Check for a default value + if ($param->isDefaultValueAvailable()) { + return $param->getDefaultValue(); + } + + if (!$type) { + throw new \Exception( + 'Failed to resolve class "' . $id . '" because param "' . $name . '" is missing a type hint' + ); + } + + if ($type instanceof \ReflectionUnionType) { + throw new \Exception( + 'Failed to resolve class "' . $id . '" because of union type for param "' . $name . '"' + ); + } + + if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()) { + return $this->get($type->getName()); + } + + throw new \Exception( + 'Failed to resolve class "' . $id . '" because invalid param "' . $name . '"' + ); + }, + $parameters + ); + + return $reflectionClass->newInstanceArgs($dependencies); + } + + public function getAllRegisteredClassNames(): array + { + return array_keys($this->entries); + } +} \ No newline at end of file diff --git a/Sources/src/app/controller/BaseController.php b/Sources/src/app/controller/BaseController.php new file mode 100644 index 00000000..5e321b07 --- /dev/null +++ b/Sources/src/app/controller/BaseController.php @@ -0,0 +1,74 @@ +container = $container; + } + + abstract public function index(): Response; + + protected function renderView(string $view, array $parameters = []): string + { + if (!$this->container->has(\Twig\Environment::class)) { + throw new \LogicException('You cannot use the "renderView" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".'); + } + + return $this->container->get(\Twig\Environment::class)->render($view, $parameters); + } + /** + * Renders a view. + * + * If an invalid form is found in the list of parameters, a 422 status code is returned. + * Forms found in parameters are auto-cast to form views. + */ + protected function render(string $view, array $parameters = [], Response $response = null): Response + { + $content = $this->renderView($view, $parameters); + $response ??= new Response(); + + /* if (200 === $response->getStatusCode()) { + foreach ($parameters as $v) { + if ($v instanceof FormInterface && $v->isSubmitted() && !$v->isValid()) { + $response->setStatusCode(422); + break; + } + } + }*/ + + $response->setContent($content); + + return $response; + } + + protected function redirect(string $url, int $status = 302): RedirectResponse + { + return new RedirectResponse($url, $status); + } + + protected function redirectToRoute(string $route, array $parameters = [], int $status = 302): RedirectResponse + { + return $this->redirect($this->generateUrl($route, $parameters), $status); + } + + /* + * TODO : Should hanle ierror if the route is not existing + * */ + protected function generateUrl(string $route, array $parameters = []): string + { + return $this->container->get(\App\Router\Router::class)->generate($route, $parameters); + } + + +} \ No newline at end of file diff --git a/Sources/src/app/controller/Controller.php b/Sources/src/app/controller/Controller.php new file mode 100644 index 00000000..29ad5cd4 --- /dev/null +++ b/Sources/src/app/controller/Controller.php @@ -0,0 +1,141 @@ +render('./page/home.html.twig',[ + 'pp' => "test2", + 'user' => "Ladmion le Cochon", + 'role' => "Athlète", + 'friendship' => [], + 'analyzes' => [], + 'mails' => [], + 'users' => [], + 'infoUser' => [], + 'exos' => [], + 'member' => [] + ]); + } + + #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8 + public function exercice(): Response + { + return $this->render('./page/exercice.html.twig',[ + 'pp' => "test2", + 'user' => "Ladmion le Cochon", + 'role' => "Athlète", + 'friendship' => [], + 'analyzes' => [], + 'mails' => [], + 'users' => [], + 'infoUser' => [], + 'exos' => [], + 'member' => [] + ]); + } + + #[Route(path: '/friend', name: 'friend', methods: ['GET'])] // 8 + public function friend(): Response + { + return $this->render('./page/friend.html.twig',[ + 'pp' => "test2", + 'user' => "Ladmion le Cochon", + 'role' => "Athlète", + 'friendship' => [], + 'analyzes' => [], + 'mails' => [], + 'users' => [], + 'infoUser' => [], + 'exos' => [], + 'member' => [] + ]); + } + + #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])] // 8 + public function coaching(): Response + { + return $this->render('./page/coaching.html.twig',[ + 'pp' => "test2", + 'user' => "Ladmion le Cochon", + 'role' => "Athlète", + 'friendship' => [], + 'analyzes' => [], + 'mails' => [], + 'users' => [], + 'infoUser' => [], + 'exos' => [], + 'member' => [] + ]); + } + + #[Route(path: '/mail', name: 'mail', methods: ['GET'])] // 8 + public function mail(): Response + { + return $this->render('./page/mail.html.twig',[ + 'pp' => "test2", + 'user' => "Ladmion le Cochon", + 'role' => "Athlète", + 'friendship' => [], + 'analyzes' => [], + 'mails' => [], + 'users' => [], + 'infoUser' => [], + 'exos' => [], + 'member' => [] + ]); + } + + #[Route(path: '/import', name: 'import', methods: ['GET'])] // 8 + public function import(): Response + { + return $this->render('./page/import.html.twig',[ + 'pp' => "test2", + 'user' => "Ladmion le Cochon", + 'role' => "Athlète", + 'friendship' => [], + 'analyzes' => [], + 'mails' => [], + 'users' => [], + 'infoUser' => [], + 'exos' => [], + 'member' => [] + ]); + } + + + + + #[Route(path: '/hello', name: 'hello', methods: ['GET'])] + public function hello(): Response + { + return new Response('Hello'); + } + + #[Route(path: '/hi', name: 'hi', methods: ['GET'])] + public function hi(string $name, IRequest $req): Response + { + return new Response($name); + } + +} + + + diff --git a/Sources/src/app/controller/FrontController.php b/Sources/src/app/controller/FrontController.php new file mode 100644 index 00000000..5fa64fac --- /dev/null +++ b/Sources/src/app/controller/FrontController.php @@ -0,0 +1,73 @@ +router = $router; + $this->container = $container; + + } + + public function dispatch(IRequest $request) { + try { + $match = $this->router->match($request); + if (!is_null($match)) { + $method = $match['target']; + + $controller = $this->getController($match['target']); + $callable = array($controller,$method[1]); + $request->addToBody($match['params']); + + if (!is_callable($callable)){ + throw new NotImplementedException('Controller target is not callable' .'Handle when route target is not a callable : not handle'); + } + $argumentResolver = $this->container->get(IArgumentResolver::class); + $arguments = $argumentResolver->getArguments($request, $callable); + // check role + $response = call_user_func_array($callable, $arguments); + + // should handle response properly like if it's a HTML, STING, JSON,.... + $response->send(); + } else { + $this->handleError(404, "Page not found"); + } + } catch (NotFoundHttpException $e) { + $this->handleError(404, $e->getMessage()); + } + } + + private function getController($controllerSpec) { + if (is_array($controllerSpec)) { + $controllerName = $controllerSpec[0]; + } else { + $controllerName = $controllerSpec; + } + + return $this->container->get($controllerName); + } + + // TODO : Don't work need Antoine help + private function handleError(int $statusCode, $message) : void { + if (!$this->container->has(\Twig\Environment::class)) { + throw new \LogicException('You cannot use the "renderView" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".'); + } + + $response = new Response($this->container->get(\Twig\Environment::class)->render('./errorbase.html.twig',['title'=> $message , "nb" => $statusCode, "name" => $message, "descr" => $message ]),$statusCode); + $response->send(); + } + +} + +?> diff --git a/Sources/src/app/router/Route.php b/Sources/src/app/router/Route.php new file mode 100644 index 00000000..97727e68 --- /dev/null +++ b/Sources/src/app/router/Route.php @@ -0,0 +1,94 @@ +path = $path; + $this->callable = $callable; + $this->name = $name; + } + + /** + * Gets the name of the route. + * + * @return string|null The name of the route. + */ + public function getName(): ?string + { + return $this->name; + } + + /** + * Sets the name of the route. + * + * @param string|null $name The name to set. + */ + public function setName(?string $name): void + { + $this->name = $name; + } + + /** + * Gets the callable associated with the route. + * + * @return callable The callable for this route. + */ + public function getCallable() + { + return $this->callable; + } + + /** + * Gets the path for the route. + * + * @return string The path for the route. + */ + public function getPath(): string + { + return $this->path; + } + + /** + * Sets the callable for the route. + * + * @param callable $callable The callable to set for this route. + */ + public function setCallable(callable $callable) + { + $this->callable = $callable; + } +} diff --git a/Sources/src/app/router/Router.php b/Sources/src/app/router/Router.php new file mode 100644 index 00000000..1461e7cf --- /dev/null +++ b/Sources/src/app/router/Router.php @@ -0,0 +1,116 @@ +path = $path; + $this->routes = new \AltoRouter(); + } + + /** + * Adds a new Route to the collection. + * + * @param string $method The HTTP method. + * @param Route $route The route object. + * @throws \InvalidArgumentException If method is not supported. + */ + public function add(string $method, Route $route) { + if (!in_array($method, self::$verbs)) { + throw new \InvalidArgumentException("Method not supported"); + } + $this->routes->map($method, $route->getPath(), $route->getCallable(), $route->getName()); + } + + /** + * Adds a route for a controller action. + * + * @param string $method The HTTP method. + * @param string $path The path for the route. + * @param mixed $controller The controller object. + * @param string $action The action method in the controller. + * @param string $name (Optional) The name of the route. + * @throws \InvalidArgumentException If method is not supported. + */ + public function addControllerRoute(string $method, string $path, $controller, string $action, string $name = '') { + if (!in_array($method, self::$verbs)) { + throw new \InvalidArgumentException("Method not supported"); + } + $this->routes->map($method, $path, [$controller, $action], $name); + } + + // TODO: Implement the extractParams method. + // public function extractParams(string $path) {} + + /** + * Adds a GET route. + * + * @param string $path The path for the route. + * @param callable $callable The callback function. + * @param string $name The name of the route. + */ + public function get(string $path, callable $callable, $name) { + $this->routes->map('GET', $path, $callable, $name); + } + + // Similar methods for post, put, etc. can be added here. + + /** + * Checks if the request can be processed. + * + * @param IRequest $request The request object. + * @return array|null The matched route or null if no match. + */ + public function match(IRequest $request): ?array { + return $this->routes->match($request->getRequestUri(), $request->getMethod()) ?: null; + } + + /** + * Returns all routes. + * + * @return array The array of routes. + */ + public function getRoutes() { + return []; // TODO: Implement the actual logic to return routes. + } + + + public function generate (string $routeName, array $params = array()): string + { + return $this->routes->generate($routeName,$params); + } + +} + +?> diff --git a/Sources/src/app/router/Session.php b/Sources/src/app/router/Session.php new file mode 100644 index 00000000..3c97d606 --- /dev/null +++ b/Sources/src/app/router/Session.php @@ -0,0 +1,121 @@ +startSession(); + + return self::$instance; + } + + + /** + * (Re)starts the session. + * + * @return bool TRUE if the session has been initialized, else FALSE. + **/ + + private function startSession() + { + if ( $this->sessionState == self::SESSION_NOT_STARTED ) + { + $this->sessionState = session_start(); + } + + return $this->sessionState; + } + + + /** + * Stores datas in the session. + * Example: $instance->foo = 'bar'; + * + * @param name Name of the datas. + * @param value Your datas. + * @return void + **/ + + public function __set( $name , $value ) + { + $_SESSION[$name] = $value; + } + + + /** + * Gets datas from the session. + * Example: echo $instance->foo; + * + * @param name Name of the datas to get. + * @return mixed Datas stored in session. + **/ + + public function __get( string $name ) + { + if ( isset($_SESSION[$name])) + { + return $_SESSION[$name]; + } + } + + + public function __isset( $name ) + { + return isset($_SESSION[$name]); + } + + + public function __unset( $name ) + { + unset( $_SESSION[$name] ); + } + + + /** + * Destroys the current session. + * + * @return bool TRUE is session has been deleted, else FALSE. + **/ + + public function destroy() + { + if ( $this->sessionState == self::SESSION_STARTED ) + { + $this->sessionState = !session_destroy(); + unset( $_SESSION ); + + return !$this->sessionState; + } + + return FALSE; + } +} diff --git a/Sources/src/app/router/middleware/HttpValidationMiddleware.php b/Sources/src/app/router/middleware/HttpValidationMiddleware.php new file mode 100644 index 00000000..9c03bd0e --- /dev/null +++ b/Sources/src/app/router/middleware/HttpValidationMiddleware.php @@ -0,0 +1,39 @@ +validator = $validator; + $this->rules = $rules; + } + + public function handle(IRequest $request, callable $next) { + $this->validateRequest($request); + return parent::handle($request, $next); + } + + private function validateRequest(IRequest $request) { + foreach ($this->rules as $param => $ruleSet) { + foreach ($ruleSet as $rule) { + $this->validator->rule($param, $rule['callback'], $rule['message']); + } + } + + $requestData = array_merge($request->getQueryParameters(), $request->getRequestParameters()); + $this->validator->assert($requestData); + } + +} + +// $validationRules = [ +// 'email' => [ +// ['callback' => Validator::required(), 'message' => 'Email is required.'], +// ['callback' => Validator::email(), 'message' => 'Email must be a valid email address.'] +// ], +// // Add more rules as needed +// ]; \ No newline at end of file diff --git a/Sources/src/app/router/middleware/IHttpMiddleware.php b/Sources/src/app/router/middleware/IHttpMiddleware.php new file mode 100644 index 00000000..a8e69938 --- /dev/null +++ b/Sources/src/app/router/middleware/IHttpMiddleware.php @@ -0,0 +1,9 @@ +getMethod()}, URI: {$request->getRequestUri()}\n"; + return parent::handle($request, $next); + } +} \ No newline at end of file diff --git a/Sources/src/app/router/middleware/Middleware.php b/Sources/src/app/router/middleware/Middleware.php new file mode 100644 index 00000000..5cfe8f39 --- /dev/null +++ b/Sources/src/app/router/middleware/Middleware.php @@ -0,0 +1,20 @@ +next = $nextMiddleware; + } + + public function handle(IRequest $request, callable $next) { + if ($this->next !== null) { + return $this->next->handle($request, $next); + } + return $next($request); + } +} diff --git a/Sources/src/app/router/request/ContentStrategy.php b/Sources/src/app/router/request/ContentStrategy.php new file mode 100644 index 00000000..00743dda --- /dev/null +++ b/Sources/src/app/router/request/ContentStrategy.php @@ -0,0 +1,6 @@ + JsonContentStrategy::class, + // Format... + ]; + + public static function createContentStrategy(string $contentType, string $requestMethod): ContentStrategy { + foreach (self::$strategyMap as $type => $className) { + if ($contentType === $type || in_array($requestMethod, ['PUT', 'PATCH', 'DELETE'])) { + return new $className(); + } + } + return new FormContentStrategy(); + } + + public static function registerStrategy(string $contentType, string $className): void { + self::$strategyMap[$contentType] = $className; + } +} \ No newline at end of file diff --git a/Sources/src/app/router/request/FormContentStrategy.php b/Sources/src/app/router/request/FormContentStrategy.php new file mode 100644 index 00000000..71bc92a9 --- /dev/null +++ b/Sources/src/app/router/request/FormContentStrategy.php @@ -0,0 +1,9 @@ +queryParameters = $query; + $this->requestUri = $server['REQUEST_URI'] ?? ''; + $this->method = strtoupper($server['REQUEST_METHOD'] ?? 'GET'); + $this->headers = $headers; + $this->requestParameters = $contentStrategy->getContent(); + $this->body = $body; + } + + public function getQueryParameters(): array { + return $this->queryParameters; + } + + public function getRequestParameters(): array { + return $this->requestParameters; + } + + public function getMethod(): string { + return $this->method; + } + + public function getRequestUri(): string { + return $this->requestUri; + } + + public function getHeaders(): array { + return $this->headers; + } + + public function getBody(): array{ + return $this->body; + } + public function addToBody(string|array $attributes){ + $this->body[] = $attributes; + } + +} \ No newline at end of file diff --git a/Sources/src/app/router/request/IRequest.php b/Sources/src/app/router/request/IRequest.php new file mode 100644 index 00000000..987558e1 --- /dev/null +++ b/Sources/src/app/router/request/IRequest.php @@ -0,0 +1,16 @@ + $value) { + if (substr($key, 0, 5) === 'HTTP_') { + $header = str_replace(' ', '-', ucwords(str_replace('_', ' ', strtolower(substr($key, 5))))); + $headers[$header] = $value; + } + } + return $headers; + } +} \ No newline at end of file diff --git a/Sources/src/app/router/response/IResponse.php b/Sources/src/app/router/response/IResponse.php new file mode 100644 index 00000000..efb35f78 --- /dev/null +++ b/Sources/src/app/router/response/IResponse.php @@ -0,0 +1,12 @@ +url = $url; + $this->statusCode = $statusCode; + $this->headers = $headers; + $this->content = ''; + } + + public function getContent(): string + { + return $this->content; + } + + public function setContent(string $content): void + { + $this->content = $content; + } + + public function getStatusCode(): int + { + return $this->statusCode; + } + + public function setStatusCode(int $statusCode): void + { + $this->statusCode = $statusCode; + } + + public function getHeaders(): array + { + return $this->headers; + } + + public function setHeader(string $key, string $value): void + { + $this->headers[$key] = $value; + } + + public function send(): void + { + http_response_code($this->statusCode); + + foreach ($this->headers as $name => $value) { + header("$name: $value"); + } + + header("Location: " . $this->url); + + // Optionally echo content if any + echo $this->content; + + exit(); + } +} diff --git a/Sources/src/app/router/response/Response.php b/Sources/src/app/router/response/Response.php new file mode 100644 index 00000000..e3c364ac --- /dev/null +++ b/Sources/src/app/router/response/Response.php @@ -0,0 +1,49 @@ +content = $content; + $this->statusCode = $statusCode; + $this->headers = $headers; + } + + public function getContent(): string { + return $this->content; + } + + public function setContent(string $content): void { + $this->content = $content; + } + + public function getStatusCode(): int { + return $this->statusCode; + } + + public function setStatusCode(int $statusCode): void { + $this->statusCode = $statusCode; + } + + public function getHeaders(): array { + return $this->headers; + } + + public function setHeader(string $key, string $value): void { + $this->headers[$key] = $value; + } + + public function send(): void { + foreach ($this->headers as $key => $value) { + header("{$key}: {$value}"); + } + http_response_code($this->statusCode); + echo $this->content; + } +} + + +?> \ No newline at end of file diff --git a/Sources/src/app/views/Templates/base.html.twig b/Sources/src/app/views/Templates/base.html.twig index d80861c7..6b72d411 100755 --- a/Sources/src/app/views/Templates/base.html.twig +++ b/Sources/src/app/views/Templates/base.html.twig @@ -46,12 +46,12 @@
Menu
- +
Accueil
Activités
- +
Exercices @@ -60,20 +60,20 @@ Analyses
Social
- +
Amis - +
Coaching - +
Messagerie
Gestion de données
- +
Importer diff --git a/Sources/src/app/views/Templates/errorbase.html.twig b/Sources/src/app/views/Templates/errorbase.html.twig index 29b82161..00db8518 100755 --- a/Sources/src/app/views/Templates/errorbase.html.twig +++ b/Sources/src/app/views/Templates/errorbase.html.twig @@ -18,10 +18,10 @@
- {% block nb %}{% endblock %} +

{% block nb %}{% endblock %}

{% block name %}{% endblock %}

{% block descr %}{% endblock %}

- + Retour à l'accueil diff --git a/Sources/src/app/views/Templates/page/addfriend.html.twig b/Sources/src/app/views/Templates/page/addfriend.html.twig index c4a48892..21548f30 100644 --- a/Sources/src/app/views/Templates/page/addfriend.html.twig +++ b/Sources/src/app/views/Templates/page/addfriend.html.twig @@ -10,7 +10,7 @@

Liste d'ami

    -
  1. Accueil
    2. +
  2. Accueil
  3. Ami
diff --git a/Sources/src/app/views/Templates/page/analyze.html.twig b/Sources/src/app/views/Templates/page/analyze.html.twig index bbada073..1966eda4 100755 --- a/Sources/src/app/views/Templates/page/analyze.html.twig +++ b/Sources/src/app/views/Templates/page/analyze.html.twig @@ -10,7 +10,7 @@

Analyses

    -
  1. Accueil
    2. +
  2. Accueil
  3. Analyses
diff --git a/Sources/src/app/views/Templates/page/coaching.html.twig b/Sources/src/app/views/Templates/page/coaching.html.twig index 1d84f28a..042e2bdf 100755 --- a/Sources/src/app/views/Templates/page/coaching.html.twig +++ b/Sources/src/app/views/Templates/page/coaching.html.twig @@ -11,7 +11,7 @@

Coaching

    -
  1. Accueil
    2. +
  2. Accueil
  3. Coaching
diff --git a/Sources/src/app/views/Templates/page/exercice.html.twig b/Sources/src/app/views/Templates/page/exercice.html.twig index 55392ac1..4955df4f 100755 --- a/Sources/src/app/views/Templates/page/exercice.html.twig +++ b/Sources/src/app/views/Templates/page/exercice.html.twig @@ -10,7 +10,7 @@

Exercices

    -
  1. Accueil
    2. +
  2. Accueil
  3. Exercices
diff --git a/Sources/src/app/views/Templates/page/profile.html.twig b/Sources/src/app/views/Templates/page/profile.html.twig index 85aac776..fd9e169c 100644 --- a/Sources/src/app/views/Templates/page/profile.html.twig +++ b/Sources/src/app/views/Templates/page/profile.html.twig @@ -10,7 +10,7 @@

Profile

    -
  1. Accueil
    2. +
  2. Accueil
  3. Profile
diff --git a/Sources/src/app/views/Templates/page/settings.html.twig b/Sources/src/app/views/Templates/page/settings.html.twig index 3ab5d548..688045ca 100644 --- a/Sources/src/app/views/Templates/page/settings.html.twig +++ b/Sources/src/app/views/Templates/page/settings.html.twig @@ -10,7 +10,7 @@

Paramètres

    -
  1. Accueil
    2. +
  2. Accueil
  3. Paramètres
diff --git a/Sources/src/app/views/directives/Navigate.php b/Sources/src/app/views/directives/Navigate.php new file mode 100644 index 00000000..c77bbdbf --- /dev/null +++ b/Sources/src/app/views/directives/Navigate.php @@ -0,0 +1,29 @@ +router = $router; + } + + public function getFunctions(): array + { + return [ + new TwigFunction('navigate', [$this, 'getPath']), + ]; + } + public function getPath(string $name, array $parameters = []): string + { + return $this->router->generate($name, $parameters); + } + + + +} \ No newline at end of file diff --git a/Sources/src/shared/ArgumentControllerResolver.php b/Sources/src/shared/ArgumentControllerResolver.php new file mode 100644 index 00000000..20bd1d1f --- /dev/null +++ b/Sources/src/shared/ArgumentControllerResolver.php @@ -0,0 +1,85 @@ +getMessage()); + } + + $args = []; + foreach ($reflectionMethod->getParameters() as $param) { + if (IRequest::class === $param->getType()->getName() || is_subclass_of($param->getType()->getName(), IRequest::class)) { + $args[] = $request; + continue; + } + + $name = $param->getName(); + $value = $this->getFromRequest($name, $request); + + if ($value === null && $param->isDefaultValueAvailable()) { + $value = $param->getDefaultValue(); + } elseif ($value === null) { + throw new \InvalidArgumentException("Missing argument: $name"); + } + + $args[] = $value; + } + + return $args; + } + + /** + * Extracts a value from the request based on a key. + * + * @param string $key The key to look for in the request. + * @param IRequest $req The request object. + * @return mixed The value from the request or null if not found. + */ + public function getFromRequest(string $key, IRequest $req): mixed + { + $body = $req->getBody(); + if (array_key_exists($key, $body)) { + return $body[$key]; + } + + $queryParams = $req->getQueryParameters(); + if (array_key_exists($key, $queryParams)) { + return $queryParams[$key]; + } + + $requestParams = $req->getRequestParameters(); + if (array_key_exists($key, $requestParams)) { + return $requestParams[$key]; + } + + return null; + } +} + diff --git a/Sources/src/shared/IArgumentResolver.php b/Sources/src/shared/IArgumentResolver.php new file mode 100644 index 00000000..0b54f356 --- /dev/null +++ b/Sources/src/shared/IArgumentResolver.php @@ -0,0 +1,19 @@ + "background-color: #fff3cd; color: #856404; border-color: #ffeeba", + self::ERROR => "background-color: #f8d7da; color: #721c24; border-color: #f5c6cb", + default => "background-color: #f8f8f8; color: #383d41; border-color: #ccc", + }; + } + + private static function addLog($something, string $level, string $label): bool|string + { + $style = self::getLogStyle($level); + + ob_start(); + echo "
";
+        echo "$label [$level] (Log " . self::$logCount . ")
";
+        var_dump($something);
+        echo "
"; + $logOutput = ob_get_clean(); + + self::$logs[] = ['level' => $level, 'output' => $logOutput]; + return $logOutput; + } + + public static function dd($something, string $label = "LOGGER", string $level = self::INFO) { + echo self::addLog($something, $level, $label); + die(); + } + + public static function ddArray(array $array, string $label = "LOGGER", string $level = self::INFO) { + self::dd($array, $label, $level); + } + + public static function log($something, string $label = "LOGGER", string $level = self::INFO) { + self::$logCount++; + echo self::addLog($something, $level, $label); + } + + public static function getLogCount(): int + { + return self::$logCount; + } + + public static function getLogsByLevel(string $level): array + { + return array_filter(self::$logs, function($log) use ($level) { + return $log['level'] === $level; + }); + } +} diff --git a/Sources/src/shared/attributes/Route.php b/Sources/src/shared/attributes/Route.php new file mode 100644 index 00000000..a7b90115 --- /dev/null +++ b/Sources/src/shared/attributes/Route.php @@ -0,0 +1,30 @@ +path; + } + + public function getName(): ?string{ + return $this->name; + } + public function getMethods(): array | string + { + return $this->methods; + } + + +} + diff --git a/Sources/src/shared/exception/HttpException.php b/Sources/src/shared/exception/HttpException.php new file mode 100644 index 00000000..e8c91cb5 --- /dev/null +++ b/Sources/src/shared/exception/HttpException.php @@ -0,0 +1,34 @@ +statusCode = $statusCode; + $this->headers = $headers; + + parent::__construct($message, $code, $previous); + } + + public function getStatusCode(): int + { + return $this->statusCode; + } + + public function getHeaders(): array + { + return $this->headers; + } + + /** + * @return void + */ + public function setHeaders(array $headers) + { + $this->headers = $headers; + } +} \ No newline at end of file diff --git a/Sources/src/shared/exception/NotFoundHttpException.php b/Sources/src/shared/exception/NotFoundHttpException.php new file mode 100644 index 00000000..0b4b25d7 --- /dev/null +++ b/Sources/src/shared/exception/NotFoundHttpException.php @@ -0,0 +1,11 @@ +errors = $errors; + } + + public function getErrors(): array + { + return $this->errors; + } + + public function __toString() { + return __CLASS__ . ": [{$this->code}]: {$this->message}\n" . $this->formatErrors(); + } + + protected function formatErrors(): string + { + return implode("\n", array_map(function ($error) { + return "- {$error}"; + }, $this->errors)); + } +} diff --git a/Sources/vendor/altorouter/altorouter/.travis.yml b/Sources/vendor/altorouter/altorouter/.travis.yml new file mode 100644 index 00000000..3bf31615 --- /dev/null +++ b/Sources/vendor/altorouter/altorouter/.travis.yml @@ -0,0 +1,7 @@ +language: php +php: + - 5.3 + - 5.4 + - 5.5 + +script: phpunit --coverage-text ./ diff --git a/Sources/vendor/altorouter/altorouter/AltoRouter.php b/Sources/vendor/altorouter/altorouter/AltoRouter.php new file mode 100644 index 00000000..67e76abc --- /dev/null +++ b/Sources/vendor/altorouter/altorouter/AltoRouter.php @@ -0,0 +1,270 @@ + '[0-9]++', + 'a' => '[0-9A-Za-z]++', + 'h' => '[0-9A-Fa-f]++', + '*' => '.+?', + '**' => '.++', + '' => '[^/\.]++' + ); + + /** + * Create router in one call from config. + * + * @param array $routes + * @param string $basePath + * @param array $matchTypes + */ + public function __construct( $routes = array(), $basePath = '', $matchTypes = array() ) { + $this->addRoutes($routes); + $this->setBasePath($basePath); + $this->addMatchTypes($matchTypes); + } + + /** + * Add multiple routes at once from array in the following format: + * + * $routes = array( + * array($method, $route, $target, $name) + * ); + * + * @param array $routes + * @return void + * @author Koen Punt + */ + public function addRoutes($routes){ + if(!is_array($routes) && !$routes instanceof Traversable) { + throw new \Exception('Routes should be an array or an instance of Traversable'); + } + foreach($routes as $route) { + call_user_func_array(array($this, 'map'), $route); + } + } + + /** + * Set the base path. + * Useful if you are running your application from a subdirectory. + */ + public function setBasePath($basePath) { + $this->basePath = $basePath; + } + + /** + * Add named match types. It uses array_merge so keys can be overwritten. + * + * @param array $matchTypes The key is the name and the value is the regex. + */ + public function addMatchTypes($matchTypes) { + $this->matchTypes = array_merge($this->matchTypes, $matchTypes); + } + + /** + * Map a route to a target + * + * @param string $method One of 4 HTTP Methods, or a pipe-separated list of multiple HTTP Methods (GET|POST|PUT|DELETE) + * @param string $route The route regex, custom regex must start with an @. You can use multiple pre-set regex filters, like [i:id] + * @param mixed $target The target where this route should point to. Can be anything. + * @param string $name Optional name of this route. Supply if you want to reverse route this url in your application. + */ + public function map($method, $route, $target, $name = null) { + + $this->routes[] = array($method, $route, $target, $name); + + if($name) { + if(isset($this->namedRoutes[$name])) { + throw new \Exception("Can not redeclare route '{$name}'"); + } else { + $this->namedRoutes[$name] = $route; + } + + } + + return; + } + + /** + * Reversed routing + * + * Generate the URL for a named route. Replace regexes with supplied parameters + * + * @param string $routeName The name of the route. + * @param array @params Associative array of parameters to replace placeholders with. + * @return string The URL of the route with named parameters in place. + */ + public function generate($routeName, array $params = array()) { + + // Check if named route exists + if(!isset($this->namedRoutes[$routeName])) { + throw new \Exception("Route '{$routeName}' does not exist."); + } + + // Replace named parameters + $route = $this->namedRoutes[$routeName]; + + // prepend base path to route url again + $url = $this->basePath . $route; + + if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) { + + foreach($matches as $match) { + list($block, $pre, $type, $param, $optional) = $match; + + if ($pre) { + $block = substr($block, 1); + } + + if(isset($params[$param])) { + $url = str_replace($block, $params[$param], $url); + } elseif ($optional) { + $url = str_replace($pre . $block, '', $url); + } + } + + + } + + return $url; + } + + /** + * Match a given Request Url against stored routes + * @param string $requestUrl + * @param string $requestMethod + * @return array|boolean Array with route information on success, false on failure (no match). + */ + public function match($requestUrl = null, $requestMethod = null) { + + $params = array(); + $match = false; + + // set Request Url if it isn't passed as parameter + if($requestUrl === null) { + $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/'; + } + + // strip base path from request url + $requestUrl = substr($requestUrl, strlen($this->basePath)); + + // Strip query string (?a=b) from Request Url + if (($strpos = strpos($requestUrl, '?')) !== false) { + $requestUrl = substr($requestUrl, 0, $strpos); + } + + // set Request Method if it isn't passed as a parameter + if($requestMethod === null) { + $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET'; + } + + // Force request_order to be GP + // http://www.mail-archive.com/internals@lists.php.net/msg33119.html + $_REQUEST = array_merge($_GET, $_POST); + + foreach($this->routes as $handler) { + list($method, $_route, $target, $name) = $handler; + + $methods = explode('|', $method); + $method_match = false; + + // Check if request method matches. If not, abandon early. (CHEAP) + foreach($methods as $method) { + if (strcasecmp($requestMethod, $method) === 0) { + $method_match = true; + break; + } + } + + // Method did not match, continue to next route. + if(!$method_match) continue; + + // Check for a wildcard (matches all) + if ($_route === '*') { + $match = true; + } elseif (isset($_route[0]) && $_route[0] === '@') { + $match = preg_match('`' . substr($_route, 1) . '`u', $requestUrl, $params); + } else { + $route = null; + $regex = false; + $j = 0; + $n = isset($_route[0]) ? $_route[0] : null; + $i = 0; + + // Find the longest non-regex substring and match it against the URI + while (true) { + if (!isset($_route[$i])) { + break; + } elseif (false === $regex) { + $c = $n; + $regex = $c === '[' || $c === '(' || $c === '.'; + if (false === $regex && false !== isset($_route[$i+1])) { + $n = $_route[$i + 1]; + $regex = $n === '?' || $n === '+' || $n === '*' || $n === '{'; + } + if (false === $regex && $c !== '/' && (!isset($requestUrl[$j]) || $c !== $requestUrl[$j])) { + continue 2; + } + $j++; + } + $route .= $_route[$i++]; + } + + $regex = $this->compileRoute($route); + $match = preg_match($regex, $requestUrl, $params); + } + + if(($match == true || $match > 0)) { + + if($params) { + foreach($params as $key => $value) { + if(is_numeric($key)) unset($params[$key]); + } + } + + return array( + 'target' => $target, + 'params' => $params, + 'name' => $name + ); + } + } + return false; + } + + /** + * Compile the regex for a given route (EXPENSIVE) + */ + private function compileRoute($route) { + if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) { + + $matchTypes = $this->matchTypes; + foreach($matches as $match) { + list($block, $pre, $type, $param, $optional) = $match; + + if (isset($matchTypes[$type])) { + $type = $matchTypes[$type]; + } + if ($pre === '.') { + $pre = '\.'; + } + + //Older versions of PCRE require the 'P' in (?P) + $pattern = '(?:' + . ($pre !== '' ? $pre : null) + . '(' + . ($param !== '' ? "?P<$param>" : null) + . $type + . '))' + . ($optional !== '' ? '?' : null); + + $route = str_replace($block, $pattern, $route); + } + + } + return "`^$route$`u"; + } +} diff --git a/Sources/vendor/altorouter/altorouter/AltoRouterTest.php b/Sources/vendor/altorouter/altorouter/AltoRouterTest.php new file mode 100644 index 00000000..2462cd82 --- /dev/null +++ b/Sources/vendor/altorouter/altorouter/AltoRouterTest.php @@ -0,0 +1,423 @@ +namedRoutes; + } + + public function getRoutes(){ + return $this->routes; + } + + public function getBasePath(){ + return $this->basePath; + } + +} + +class SimpleTraversable implements Iterator{ + + protected $_position = 0; + + protected $_data = array( + array('GET', '/foo', 'foo_action', null), + array('POST', '/bar', 'bar_action', 'second_route') + ); + + public function current(){ + return $this->_data[$this->_position]; + } + public function key(){ + return $this->_position; + } + public function next(){ + ++$this->_position; + } + public function rewind(){ + $this->_position = 0; + } + public function valid(){ + return isset($this->_data[$this->_position]); + } + +} + +/** + * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-07-14 at 17:47:46. + */ +class AltoRouterTest extends PHPUnit_Framework_TestCase +{ + /** + * @var AltoRouter + */ + protected $router; + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + */ + protected function setUp() + { + $this->router = new AltoRouterDebug; + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + */ + protected function tearDown() + { + } + + /** + * @covers AltoRouter::addRoutes + */ + public function testAddRoutes() + { + $method = 'POST'; + $route = '/[:controller]/[:action]'; + $target = function(){}; + + $this->router->addRoutes(array( + array($method, $route, $target), + array($method, $route, $target, 'second_route') + )); + + $routes = $this->router->getRoutes(); + + $this->assertEquals(array($method, $route, $target, null), $routes[0]); + $this->assertEquals(array($method, $route, $target, 'second_route'), $routes[1]); + } + + /** + * @covers AltoRouter::addRoutes + */ + public function testAddRoutesAcceptsTraverable() + { + $traversable = new SimpleTraversable(); + $this->router->addRoutes($traversable); + + $traversable->rewind(); + + $first = $traversable->current(); + $traversable->next(); + $second = $traversable->current(); + + $routes = $this->router->getRoutes(); + + $this->assertEquals($first, $routes[0]); + $this->assertEquals($second, $routes[1]); + } + + /** + * @covers AltoRouter::addRoutes + * @expectedException Exception + */ + public function testAddRoutesThrowsExceptionOnInvalidArgument() + { + $this->router->addRoutes(new stdClass); + } + + /** + * @covers AltoRouter::setBasePath + */ + public function testSetBasePath() + { + $basePath = $this->router->setBasePath('/some/path'); + $this->assertEquals('/some/path', $this->router->getBasePath()); + + $basePath = $this->router->setBasePath('/some/path'); + $this->assertEquals('/some/path', $this->router->getBasePath()); + } + + /** + * @covers AltoRouter::map + */ + public function testMap() + { + $method = 'POST'; + $route = '/[:controller]/[:action]'; + $target = function(){}; + + $this->router->map($method, $route, $target); + + $routes = $this->router->getRoutes(); + + $this->assertEquals(array($method, $route, $target, null), $routes[0]); + } + + /** + * @covers AltoRouter::map + */ + public function testMapWithName() + { + $method = 'POST'; + $route = '/[:controller]/[:action]'; + $target = function(){}; + $name = 'myroute'; + + $this->router->map($method, $route, $target, $name); + + $routes = $this->router->getRoutes(); + $this->assertEquals(array($method, $route, $target, $name), $routes[0]); + + $named_routes = $this->router->getNamedRoutes(); + $this->assertEquals($route, $named_routes[$name]); + + try{ + $this->router->map($method, $route, $target, $name); + $this->fail('Should not be able to add existing named route'); + }catch(Exception $e){ + $this->assertEquals("Can not redeclare route '{$name}'", $e->getMessage()); + } + } + + + /** + * @covers AltoRouter::generate + */ + public function testGenerate() + { + $params = array( + 'controller' => 'test', + 'action' => 'someaction' + ); + + $this->router->map('GET', '/[:controller]/[:action]', function(){}, 'foo_route'); + + $this->assertEquals('/test/someaction', + $this->router->generate('foo_route', $params)); + + $params = array( + 'controller' => 'test', + 'action' => 'someaction', + 'type' => 'json' + ); + + $this->assertEquals('/test/someaction', + $this->router->generate('foo_route', $params)); + + } + + public function testGenerateWithOptionalUrlParts() + { + $this->router->map('GET', '/[:controller]/[:action].[:type]?', function(){}, 'bar_route'); + + $params = array( + 'controller' => 'test', + 'action' => 'someaction' + ); + + $this->assertEquals('/test/someaction', + $this->router->generate('bar_route', $params)); + + $params = array( + 'controller' => 'test', + 'action' => 'someaction', + 'type' => 'json' + ); + + $this->assertEquals('/test/someaction.json', + $this->router->generate('bar_route', $params)); + } + + public function testGenerateWithNonexistingRoute() + { + try{ + $this->router->generate('nonexisting_route'); + $this->fail('Should trigger an exception on nonexisting named route'); + }catch(Exception $e){ + $this->assertEquals("Route 'nonexisting_route' does not exist.", $e->getMessage()); + } + } + + /** + * @covers AltoRouter::match + * @covers AltoRouter::compileRoute + */ + public function testMatch() + { + $this->router->map('GET', '/foo/[:controller]/[:action]', 'foo_action', 'foo_route'); + + $this->assertEquals(array( + 'target' => 'foo_action', + 'params' => array( + 'controller' => 'test', + 'action' => 'do' + ), + 'name' => 'foo_route' + ), $this->router->match('/foo/test/do', 'GET')); + + $this->assertFalse($this->router->match('/foo/test/do', 'POST')); + + $this->assertEquals(array( + 'target' => 'foo_action', + 'params' => array( + 'controller' => 'test', + 'action' => 'do' + ), + 'name' => 'foo_route' + ), $this->router->match('/foo/test/do?param=value', 'GET')); + + } + + public function testMatchWithFixedParamValues() + { + $this->router->map('POST','/users/[i:id]/[delete|update:action]', 'usersController#doAction', 'users_do'); + + $this->assertEquals(array( + 'target' => 'usersController#doAction', + 'params' => array( + 'id' => 1, + 'action' => 'delete' + ), + 'name' => 'users_do' + ), $this->router->match('/users/1/delete', 'POST')); + + $this->assertFalse($this->router->match('/users/1/delete', 'GET')); + $this->assertFalse($this->router->match('/users/abc/delete', 'POST')); + $this->assertFalse($this->router->match('/users/1/create', 'GET')); + } + + public function testMatchWithServerVars() + { + $this->router->map('GET', '/foo/[:controller]/[:action]', 'foo_action', 'foo_route'); + + $_SERVER['REQUEST_URI'] = '/foo/test/do'; + $_SERVER['REQUEST_METHOD'] = 'GET'; + + $this->assertEquals(array( + 'target' => 'foo_action', + 'params' => array( + 'controller' => 'test', + 'action' => 'do' + ), + 'name' => 'foo_route' + ), $this->router->match()); + } + + public function testMatchWithOptionalUrlParts() + { + $this->router->map('GET', '/bar/[:controller]/[:action].[:type]?', 'bar_action', 'bar_route'); + + $this->assertEquals(array( + 'target' => 'bar_action', + 'params' => array( + 'controller' => 'test', + 'action' => 'do', + 'type' => 'json' + ), + 'name' => 'bar_route' + ), $this->router->match('/bar/test/do.json', 'GET')); + + } + + public function testMatchWithWildcard() + { + $this->router->map('GET', '/a', 'foo_action', 'foo_route'); + $this->router->map('GET', '*', 'bar_action', 'bar_route'); + + $this->assertEquals(array( + 'target' => 'bar_action', + 'params' => array(), + 'name' => 'bar_route' + ), $this->router->match('/everything', 'GET')); + + } + + public function testMatchWithCustomRegexp() + { + $this->router->map('GET', '@^/[a-z]*$', 'bar_action', 'bar_route'); + + $this->assertEquals(array( + 'target' => 'bar_action', + 'params' => array(), + 'name' => 'bar_route' + ), $this->router->match('/everything', 'GET')); + + $this->assertFalse($this->router->match('/some-other-thing', 'GET')); + + } + + public function testMatchWithUnicodeRegex() + { + $pattern = '/(?[^'; + // Arabic characters + $pattern .= '\x{0600}-\x{06FF}'; + $pattern .= '\x{FB50}-\x{FDFD}'; + $pattern .= '\x{FE70}-\x{FEFF}'; + $pattern .= '\x{0750}-\x{077F}'; + // Alphanumeric, /, _, - and space characters + $pattern .= 'a-zA-Z0-9\/_-\s'; + // 'ZERO WIDTH NON-JOINER' + $pattern .= '\x{200C}'; + $pattern .= ']+)'; + + $this->router->map('GET', '@' . $pattern, 'unicode_action', 'unicode_route'); + + $this->assertEquals(array( + 'target' => 'unicode_action', + 'name' => 'unicode_route', + 'params' => array( + 'path' => '大家好' + ) + ), $this->router->match('/大家好', 'GET')); + + $this->assertFalse($this->router->match('/﷽‎', 'GET')); + } + + /** + * @covers AltoRouter::addMatchTypes + */ + public function testMatchWithCustomNamedRegex() + { + $this->router->addMatchTypes(array('cId' => '[a-zA-Z]{2}[0-9](?:_[0-9]++)?')); + $this->router->map('GET', '/bar/[cId:customId]', 'bar_action', 'bar_route'); + + $this->assertEquals(array( + 'target' => 'bar_action', + 'params' => array( + 'customId' => 'AB1', + ), + 'name' => 'bar_route' + ), $this->router->match('/bar/AB1', 'GET')); + + $this->assertEquals(array( + 'target' => 'bar_action', + 'params' => array( + 'customId' => 'AB1_0123456789', + ), + 'name' => 'bar_route' + ), $this->router->match('/bar/AB1_0123456789', 'GET')); + + $this->assertFalse($this->router->match('/some-other-thing', 'GET')); + + } + + public function testMatchWithCustomNamedUnicodeRegex() + { + $pattern = '[^'; + // Arabic characters + $pattern .= '\x{0600}-\x{06FF}'; + $pattern .= '\x{FB50}-\x{FDFD}'; + $pattern .= '\x{FE70}-\x{FEFF}'; + $pattern .= '\x{0750}-\x{077F}'; + $pattern .= ']+'; + + $this->router->addMatchTypes(array('nonArabic' => $pattern)); + $this->router->map('GET', '/bar/[nonArabic:string]', 'non_arabic_action', 'non_arabic_route'); + + $this->assertEquals(array( + 'target' => 'non_arabic_action', + 'name' => 'non_arabic_route', + 'params' => array( + 'string' => 'some-path' + ) + ), $this->router->match('/bar/some-path', 'GET')); + + $this->assertFalse($this->router->match('/﷽‎', 'GET')); + } +} diff --git a/Sources/vendor/altorouter/altorouter/README.md b/Sources/vendor/altorouter/altorouter/README.md new file mode 100644 index 00000000..cb2acb3f --- /dev/null +++ b/Sources/vendor/altorouter/altorouter/README.md @@ -0,0 +1,92 @@ +# AltoRouter [![Build Status](https://api.travis-ci.org/dannyvankooten/AltoRouter.png)](http://travis-ci.org/dannyvankooten/AltoRouter) +AltoRouter is a small but powerful routing class for PHP 5.3+, heavily inspired by [klein.php](https://github.com/chriso/klein.php/). + +* Dynamic routing with named parameters +* Reversed routing +* Flexible regular expression routing (inspired by [Sinatra](http://www.sinatrarb.com/)) +* Custom regexes + +## Getting started + +1. PHP 5.3.x is required +2. Install AltoRouter using Composer or manually +2. Setup URL rewriting so that all requests are handled by **index.php** +3. Create an instance of AltoRouter, map your routes and match a request. +4. Have a look at the basic example in the `examples` directory for a better understanding on how to use AltoRouter. + +## Routing +```php +$router = new AltoRouter(); +$router->setBasePath('/AltoRouter'); // (optional) the subdir AltoRouter lives in + +// mapping routes +$router->map('GET|POST','/', 'home#index', 'home'); +$router->map('GET','/users', array('c' => 'UserController', 'a' => 'ListAction')); +$router->map('GET','/users/[i:id]', 'users#show', 'users_show'); +$router->map('POST','/users/[i:id]/[delete|update:action]', 'usersController#doAction', 'users_do'); + +// reversed routing +$router->generate('users_show', array('id' => 5)); + +``` + +**You can use the following limits on your named parameters. AltoRouter will create the correct regexes for you.** + +```php +* // Match all request URIs +[i] // Match an integer +[i:id] // Match an integer as 'id' +[a:action] // Match alphanumeric characters as 'action' +[h:key] // Match hexadecimal characters as 'key' +[:action] // Match anything up to the next / or end of the URI as 'action' +[create|edit:action] // Match either 'create' or 'edit' as 'action' +[*] // Catch all (lazy, stops at the next trailing slash) +[*:trailing] // Catch all as 'trailing' (lazy) +[**:trailing] // Catch all (possessive - will match the rest of the URI) +.[:format]? // Match an optional parameter 'format' - a / or . before the block is also optional +``` + +**Some more complicated examples** + +```php +@/(?[A-Za-z]{2}_[A-Za-z]{2})$ // custom regex, matches language codes like "en_us" etc. +/posts/[*:title][i:id] // Matches "/posts/this-is-a-title-123" +/output.[xml|json:format]? // Matches "/output", "output.xml", "output.json" +/[:controller]?/[:action]? // Matches the typical /controller/action format +``` + +**The character before the colon (the 'match type') is a shortcut for one of the following regular expressions** + +```php +'i' => '[0-9]++' +'a' => '[0-9A-Za-z]++' +'h' => '[0-9A-Fa-f]++' +'*' => '.+?' +'**' => '.++' +'' => '[^/\.]++' +``` + +**New match types can be added using the `addMatchTypes()` method** + +```php +$router->addMatchTypes(array('cId' => '[a-zA-Z]{2}[0-9](?:_[0-9]++)?')); +``` + + +## Contributors +- [Danny van Kooten](https://github.com/dannyvankooten) +- [Koen Punt](https://github.com/koenpunt) +- [John Long](https://github.com/adduc) +- [Niahoo Osef](https://github.com/niahoo) + +## License + +(MIT License) + +Copyright (c) 2012-2013 Danny van Kooten + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Sources/vendor/altorouter/altorouter/composer.json b/Sources/vendor/altorouter/altorouter/composer.json new file mode 100644 index 00000000..58e86c4c --- /dev/null +++ b/Sources/vendor/altorouter/altorouter/composer.json @@ -0,0 +1,28 @@ +{ + "name": "altorouter/altorouter", + "description": "A lightning fast router for PHP", + "keywords": ["router", "routing", "lightweight"], + "homepage": "https://github.com/dannyvankooten/AltoRouter", + "license": "MIT", + "authors": [ + { + "name": "Danny van Kooten", + "email": "dannyvankooten@gmail.com", + "homepage": "http://dannyvankooten.com/" + }, + { + "name": "Koen Punt", + "homepage": "https://github.com/koenpunt" + }, + { + "name": "niahoo", + "homepage": "https://github.com/niahoo" + } + ], + "require": { + "php": ">=5.3.0" + }, + "autoload": { + "classmap": ["AltoRouter.php"] + } +} diff --git a/Sources/vendor/altorouter/altorouter/examples/basic/.htaccess b/Sources/vendor/altorouter/altorouter/examples/basic/.htaccess new file mode 100644 index 00000000..d7e13207 --- /dev/null +++ b/Sources/vendor/altorouter/altorouter/examples/basic/.htaccess @@ -0,0 +1,3 @@ +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule . index.php [L] diff --git a/Sources/vendor/altorouter/altorouter/examples/basic/index.php b/Sources/vendor/altorouter/altorouter/examples/basic/index.php new file mode 100644 index 00000000..83266953 --- /dev/null +++ b/Sources/vendor/altorouter/altorouter/examples/basic/index.php @@ -0,0 +1,27 @@ +setBasePath('/AltoRouter/examples/basic'); +$router->map('GET|POST','/', 'home#index', 'home'); +$router->map('GET','/users/', array('c' => 'UserController', 'a' => 'ListAction')); +$router->map('GET','/users/[i:id]', 'users#show', 'users_show'); +$router->map('POST','/users/[i:id]/[delete|update:action]', 'usersController#doAction', 'users_do'); + +// match current request +$match = $router->match(); +?> +

AltoRouter

+ +

Current request:

+
+	Target: 
+	Params: 
+	Name: 	
+
+ +

Try these requests:

+

GET generate('home'); ?>

+

GET generate('users_show', array('id' => 5)); ?>

+

diff --git a/Sources/vendor/composer/autoload_classmap.php b/Sources/vendor/composer/autoload_classmap.php index 6cf10c26..b851eef9 100755 --- a/Sources/vendor/composer/autoload_classmap.php +++ b/Sources/vendor/composer/autoload_classmap.php @@ -6,6 +6,8 @@ $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( + 'AltoRouter' => $vendorDir . '/altorouter/altorouter/AltoRouter.php', + 'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php', 'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php', 'PHPUnit\\Exception' => $vendorDir . '/phpunit/phpunit/src/Exception.php', 'PHPUnit\\Framework\\ActualValueIsNotAnObjectException' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception/ActualValueIsNotAnObjectException.php', @@ -427,6 +429,7 @@ return array( 'PharIo\\Version\\VersionConstraintParser' => $vendorDir . '/phar-io/version/src/VersionConstraintParser.php', 'PharIo\\Version\\VersionConstraintValue' => $vendorDir . '/phar-io/version/src/VersionConstraintValue.php', 'PharIo\\Version\\VersionNumber' => $vendorDir . '/phar-io/version/src/VersionNumber.php', + 'PhpToken' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php', 'SebastianBergmann\\CliParser\\AmbiguousOptionException' => $vendorDir . '/sebastian/cli-parser/src/exceptions/AmbiguousOptionException.php', 'SebastianBergmann\\CliParser\\Exception' => $vendorDir . '/sebastian/cli-parser/src/exceptions/Exception.php', 'SebastianBergmann\\CliParser\\OptionDoesNotAllowArgumentException' => $vendorDir . '/sebastian/cli-parser/src/exceptions/OptionDoesNotAllowArgumentException.php', @@ -627,6 +630,7 @@ return array( 'SebastianBergmann\\Type\\UnknownType' => $vendorDir . '/sebastian/type/src/type/UnknownType.php', 'SebastianBergmann\\Type\\VoidType' => $vendorDir . '/sebastian/type/src/type/VoidType.php', 'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php', + 'Stringable' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Stringable.php', 'TheSeer\\Tokenizer\\Exception' => $vendorDir . '/theseer/tokenizer/src/Exception.php', 'TheSeer\\Tokenizer\\NamespaceUri' => $vendorDir . '/theseer/tokenizer/src/NamespaceUri.php', 'TheSeer\\Tokenizer\\NamespaceUriException' => $vendorDir . '/theseer/tokenizer/src/NamespaceUriException.php', @@ -635,4 +639,6 @@ return array( 'TheSeer\\Tokenizer\\TokenCollectionException' => $vendorDir . '/theseer/tokenizer/src/TokenCollectionException.php', 'TheSeer\\Tokenizer\\Tokenizer' => $vendorDir . '/theseer/tokenizer/src/Tokenizer.php', 'TheSeer\\Tokenizer\\XMLSerializer' => $vendorDir . '/theseer/tokenizer/src/XMLSerializer.php', + 'UnhandledMatchError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php', + 'ValueError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/ValueError.php', ); diff --git a/Sources/vendor/composer/autoload_files.php b/Sources/vendor/composer/autoload_files.php index 867d197d..25b2d88c 100755 --- a/Sources/vendor/composer/autoload_files.php +++ b/Sources/vendor/composer/autoload_files.php @@ -6,8 +6,9 @@ $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( - '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php', + 'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php', + '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', 'ec07570ca5a812141189b1fa81503674' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert/Functions.php', ); diff --git a/Sources/vendor/composer/autoload_psr4.php b/Sources/vendor/composer/autoload_psr4.php index 6676c0ae..a1eb03dc 100755 --- a/Sources/vendor/composer/autoload_psr4.php +++ b/Sources/vendor/composer/autoload_psr4.php @@ -7,11 +7,26 @@ $baseDir = dirname($vendorDir); return array( 'Twig\\' => array($vendorDir . '/twig/twig/src'), + 'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'), 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'), 'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'), + 'Shared\\Exception\\' => array($baseDir . '/src/shared/exception'), + 'Shared\\Attributes\\' => array($baseDir . '/src/shared/attributes'), + 'Shared\\' => array($baseDir . '/src/shared'), + 'Psr\\Container\\' => array($vendorDir . '/psr/container/src'), 'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'), + 'PhpOption\\' => array($vendorDir . '/phpoption/phpoption/src/PhpOption'), 'Hearttrack\\' => array($baseDir . '/src'), + 'GrahamCampbell\\ResultType\\' => array($vendorDir . '/graham-campbell/result-type/src'), + 'Dotenv\\' => array($vendorDir . '/vlucas/phpdotenv/src'), 'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'), 'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'), - 'Console\\' => array($baseDir . '/src/Console'), + 'Console\\' => array($baseDir . '/src/console'), + 'App\\Views\\Directives\\' => array($baseDir . '/src/app/views/directives'), + 'App\\Router\\Response\\' => array($baseDir . '/src/app/router/response'), + 'App\\Router\\Request\\' => array($baseDir . '/src/app/router/request'), + 'App\\Router\\Middleware\\' => array($baseDir . '/src/app/router/middleware'), + 'App\\Router\\' => array($baseDir . '/src/app/router'), + 'App\\Controller\\' => array($baseDir . '/src/app/controller'), + 'App\\' => array($baseDir . '/src/app'), ); diff --git a/Sources/vendor/composer/autoload_static.php b/Sources/vendor/composer/autoload_static.php index b4852ed3..0c991abd 100755 --- a/Sources/vendor/composer/autoload_static.php +++ b/Sources/vendor/composer/autoload_static.php @@ -7,9 +7,10 @@ namespace Composer\Autoload; class ComposerStaticInitb084bad56d99d613841073027e5f5e7e { public static $files = array ( - '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', + 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', + '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', 'ec07570ca5a812141189b1fa81503674' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Assert/Functions.php', ); @@ -20,19 +21,30 @@ class ComposerStaticInitb084bad56d99d613841073027e5f5e7e ), 'S' => array ( + 'Symfony\\Polyfill\\Php80\\' => 23, 'Symfony\\Polyfill\\Mbstring\\' => 26, 'Symfony\\Polyfill\\Ctype\\' => 23, + 'Shared\\Exception\\' => 17, + 'Shared\\Attributes\\' => 18, + 'Shared\\' => 7, ), 'P' => array ( + 'Psr\\Container\\' => 14, 'PhpParser\\' => 10, + 'PhpOption\\' => 10, ), 'H' => array ( 'Hearttrack\\' => 11, ), + 'G' => + array ( + 'GrahamCampbell\\ResultType\\' => 26, + ), 'D' => array ( + 'Dotenv\\' => 7, 'Doctrine\\Instantiator\\' => 22, 'DeepCopy\\' => 9, ), @@ -40,6 +52,16 @@ class ComposerStaticInitb084bad56d99d613841073027e5f5e7e array ( 'Console\\' => 8, ), + 'A' => + array ( + 'App\\Views\\Directives\\' => 21, + 'App\\Router\\Response\\' => 20, + 'App\\Router\\Request\\' => 19, + 'App\\Router\\Middleware\\' => 22, + 'App\\Router\\' => 11, + 'App\\Controller\\' => 15, + 'App\\' => 4, + ), ); public static $prefixDirsPsr4 = array ( @@ -47,6 +69,10 @@ class ComposerStaticInitb084bad56d99d613841073027e5f5e7e array ( 0 => __DIR__ . '/..' . '/twig/twig/src', ), + 'Symfony\\Polyfill\\Php80\\' => + array ( + 0 => __DIR__ . '/..' . '/symfony/polyfill-php80', + ), 'Symfony\\Polyfill\\Mbstring\\' => array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring', @@ -55,14 +81,42 @@ class ComposerStaticInitb084bad56d99d613841073027e5f5e7e array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-ctype', ), + 'Shared\\Exception\\' => + array ( + 0 => __DIR__ . '/../..' . '/src/shared/exception', + ), + 'Shared\\Attributes\\' => + array ( + 0 => __DIR__ . '/../..' . '/src/shared/attributes', + ), + 'Shared\\' => + array ( + 0 => __DIR__ . '/../..' . '/src/shared', + ), + 'Psr\\Container\\' => + array ( + 0 => __DIR__ . '/..' . '/psr/container/src', + ), 'PhpParser\\' => array ( 0 => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser', ), + 'PhpOption\\' => + array ( + 0 => __DIR__ . '/..' . '/phpoption/phpoption/src/PhpOption', + ), 'Hearttrack\\' => array ( 0 => __DIR__ . '/../..' . '/src', ), + 'GrahamCampbell\\ResultType\\' => + array ( + 0 => __DIR__ . '/..' . '/graham-campbell/result-type/src', + ), + 'Dotenv\\' => + array ( + 0 => __DIR__ . '/..' . '/vlucas/phpdotenv/src', + ), 'Doctrine\\Instantiator\\' => array ( 0 => __DIR__ . '/..' . '/doctrine/instantiator/src/Doctrine/Instantiator', @@ -73,11 +127,41 @@ class ComposerStaticInitb084bad56d99d613841073027e5f5e7e ), 'Console\\' => array ( - 0 => __DIR__ . '/../..' . '/src/Console', + 0 => __DIR__ . '/../..' . '/src/console', + ), + 'App\\Views\\Directives\\' => + array ( + 0 => __DIR__ . '/../..' . '/src/app/views/directives', + ), + 'App\\Router\\Response\\' => + array ( + 0 => __DIR__ . '/../..' . '/src/app/router/response', + ), + 'App\\Router\\Request\\' => + array ( + 0 => __DIR__ . '/../..' . '/src/app/router/request', + ), + 'App\\Router\\Middleware\\' => + array ( + 0 => __DIR__ . '/../..' . '/src/app/router/middleware', + ), + 'App\\Router\\' => + array ( + 0 => __DIR__ . '/../..' . '/src/app/router', + ), + 'App\\Controller\\' => + array ( + 0 => __DIR__ . '/../..' . '/src/app/controller', + ), + 'App\\' => + array ( + 0 => __DIR__ . '/../..' . '/src/app', ), ); public static $classMap = array ( + 'AltoRouter' => __DIR__ . '/..' . '/altorouter/altorouter/AltoRouter.php', + 'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php', 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', 'PHPUnit\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Exception.php', 'PHPUnit\\Framework\\ActualValueIsNotAnObjectException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Exception/ActualValueIsNotAnObjectException.php', @@ -499,6 +583,7 @@ class ComposerStaticInitb084bad56d99d613841073027e5f5e7e 'PharIo\\Version\\VersionConstraintParser' => __DIR__ . '/..' . '/phar-io/version/src/VersionConstraintParser.php', 'PharIo\\Version\\VersionConstraintValue' => __DIR__ . '/..' . '/phar-io/version/src/VersionConstraintValue.php', 'PharIo\\Version\\VersionNumber' => __DIR__ . '/..' . '/phar-io/version/src/VersionNumber.php', + 'PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php', 'SebastianBergmann\\CliParser\\AmbiguousOptionException' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/AmbiguousOptionException.php', 'SebastianBergmann\\CliParser\\Exception' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/Exception.php', 'SebastianBergmann\\CliParser\\OptionDoesNotAllowArgumentException' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/OptionDoesNotAllowArgumentException.php', @@ -699,6 +784,7 @@ class ComposerStaticInitb084bad56d99d613841073027e5f5e7e 'SebastianBergmann\\Type\\UnknownType' => __DIR__ . '/..' . '/sebastian/type/src/type/UnknownType.php', 'SebastianBergmann\\Type\\VoidType' => __DIR__ . '/..' . '/sebastian/type/src/type/VoidType.php', 'SebastianBergmann\\Version' => __DIR__ . '/..' . '/sebastian/version/src/Version.php', + 'Stringable' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Stringable.php', 'TheSeer\\Tokenizer\\Exception' => __DIR__ . '/..' . '/theseer/tokenizer/src/Exception.php', 'TheSeer\\Tokenizer\\NamespaceUri' => __DIR__ . '/..' . '/theseer/tokenizer/src/NamespaceUri.php', 'TheSeer\\Tokenizer\\NamespaceUriException' => __DIR__ . '/..' . '/theseer/tokenizer/src/NamespaceUriException.php', @@ -707,6 +793,8 @@ class ComposerStaticInitb084bad56d99d613841073027e5f5e7e 'TheSeer\\Tokenizer\\TokenCollectionException' => __DIR__ . '/..' . '/theseer/tokenizer/src/TokenCollectionException.php', 'TheSeer\\Tokenizer\\Tokenizer' => __DIR__ . '/..' . '/theseer/tokenizer/src/Tokenizer.php', 'TheSeer\\Tokenizer\\XMLSerializer' => __DIR__ . '/..' . '/theseer/tokenizer/src/XMLSerializer.php', + 'UnhandledMatchError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php', + 'ValueError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/ValueError.php', ); public static function getInitializer(ClassLoader $loader) diff --git a/Sources/vendor/composer/installed.json b/Sources/vendor/composer/installed.json index e49e82ae..cb5c63e4 100755 --- a/Sources/vendor/composer/installed.json +++ b/Sources/vendor/composer/installed.json @@ -1,5 +1,63 @@ { "packages": [ + { + "name": "altorouter/altorouter", + "version": "v1.1.0", + "version_normalized": "1.1.0.0", + "source": { + "type": "git", + "url": "https://github.com/dannyvankooten/AltoRouter.git", + "reference": "09d9d946c546bae6d22a7654cdb3b825ffda54b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dannyvankooten/AltoRouter/zipball/09d9d946c546bae6d22a7654cdb3b825ffda54b4", + "reference": "09d9d946c546bae6d22a7654cdb3b825ffda54b4", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2014-04-16T09:44:40+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "AltoRouter.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Danny van Kooten", + "email": "dannyvankooten@gmail.com", + "homepage": "http://dannyvankooten.com/" + }, + { + "name": "Koen Punt", + "homepage": "https://github.com/koenpunt" + }, + { + "name": "niahoo", + "homepage": "https://github.com/niahoo" + } + ], + "description": "A lightning fast router for PHP", + "homepage": "https://github.com/dannyvankooten/AltoRouter", + "keywords": [ + "lightweight", + "router", + "routing" + ], + "support": { + "issues": "https://github.com/dannyvankooten/AltoRouter/issues", + "source": "https://github.com/dannyvankooten/AltoRouter/tree/master" + }, + "install-path": "../altorouter/altorouter" + }, { "name": "doctrine/instantiator", "version": "1.5.0", @@ -73,6 +131,71 @@ ], "install-path": "../doctrine/instantiator" }, + { + "name": "graham-campbell/result-type", + "version": "v1.1.2", + "version_normalized": "1.1.2.0", + "source": { + "type": "git", + "url": "https://github.com/GrahamCampbell/Result-Type.git", + "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862", + "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + }, + "time": "2023-11-12T22:16:48+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "GrahamCampbell\\ResultType\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + } + ], + "description": "An Implementation Of The Result Type", + "keywords": [ + "Graham Campbell", + "GrahamCampbell", + "Result Type", + "Result-Type", + "result" + ], + "support": { + "issues": "https://github.com/GrahamCampbell/Result-Type/issues", + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type", + "type": "tidelift" + } + ], + "install-path": "../graham-campbell/result-type" + }, { "name": "myclabs/deep-copy", "version": "1.11.1", @@ -311,6 +434,84 @@ }, "install-path": "../phar-io/version" }, + { + "name": "phpoption/phpoption", + "version": "1.9.2", + "version_normalized": "1.9.2.0", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820", + "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + }, + "time": "2023-11-12T21:59:55+00:00", + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "PhpOption\\": "src/PhpOption/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh" + }, + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + } + ], + "description": "Option Type for PHP", + "keywords": [ + "language", + "option", + "php", + "type" + ], + "support": { + "issues": "https://github.com/schmittjoh/php-option/issues", + "source": "https://github.com/schmittjoh/php-option/tree/1.9.2" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], + "install-path": "../phpoption/phpoption" + }, { "name": "phpunit/php-code-coverage", "version": "9.2.29", @@ -751,6 +952,62 @@ ], "install-path": "../phpunit/phpunit" }, + { + "name": "psr/container", + "version": "2.0.2", + "version_normalized": "2.0.2.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "time": "2021-11-05T16:47:00+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "install-path": "../psr/container" + }, { "name": "sebastian/cli-parser", "version": "1.0.1", @@ -1934,19 +2191,105 @@ ], "install-path": "../symfony/polyfill-mbstring" }, + { + "name": "symfony/polyfill-php80", + "version": "v1.28.0", + "version_normalized": "1.28.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "time": "2023-01-26T09:26:14+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "installation-source": "dist", + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "install-path": "../symfony/polyfill-php80" + }, { "name": "theseer/tokenizer", - "version": "1.2.1", - "version_normalized": "1.2.1.0", + "version": "1.2.2", + "version_normalized": "1.2.2.0", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -1955,7 +2298,7 @@ "ext-xmlwriter": "*", "php": "^7.2 || ^8.0" }, - "time": "2021-07-28T10:34:58+00:00", + "time": "2023-11-20T00:12:19+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1977,7 +2320,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -1989,29 +2332,30 @@ }, { "name": "twig/twig", - "version": "v3.7.1", - "version_normalized": "3.7.1.0", + "version": "v3.8.0", + "version_normalized": "3.8.0.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554" + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", - "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3" + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php80": "^1.22" }, "require-dev": { "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3" + "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" }, - "time": "2023-08-28T11:09:02+00:00", + "time": "2023-11-21T18:54:41+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2047,7 +2391,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.7.1" + "source": "https://github.com/twigphp/Twig/tree/v3.8.0" }, "funding": [ { @@ -2060,6 +2404,93 @@ } ], "install-path": "../twig/twig" + }, + { + "name": "vlucas/phpdotenv", + "version": "v5.6.0", + "version_normalized": "5.6.0.0", + "source": { + "type": "git", + "url": "https://github.com/vlucas/phpdotenv.git", + "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", + "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", + "shasum": "" + }, + "require": { + "ext-pcre": "*", + "graham-campbell/result-type": "^1.1.2", + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9.2", + "symfony/polyfill-ctype": "^1.24", + "symfony/polyfill-mbstring": "^1.24", + "symfony/polyfill-php80": "^1.24" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "ext-filter": "*", + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + }, + "suggest": { + "ext-filter": "Required to use the boolean validator." + }, + "time": "2023-11-12T22:43:29+00:00", + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, + "branch-alias": { + "dev-master": "5.6-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Dotenv\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Vance Lucas", + "email": "vance@vancelucas.com", + "homepage": "https://github.com/vlucas" + } + ], + "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", + "keywords": [ + "dotenv", + "env", + "environment" + ], + "support": { + "issues": "https://github.com/vlucas/phpdotenv/issues", + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], + "install-path": "../vlucas/phpdotenv" } ], "dev": true, diff --git a/Sources/vendor/composer/installed.php b/Sources/vendor/composer/installed.php index a067fbb0..b9da321e 100755 --- a/Sources/vendor/composer/installed.php +++ b/Sources/vendor/composer/installed.php @@ -3,13 +3,22 @@ 'name' => 'hearttrack/package', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '03e37247f2bc193deb0684e154c42c29a7fc9ea2', + 'reference' => '79311b1041e6dc02c8f58f9bc46bc20ba368ed58', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev' => true, ), 'versions' => array( + 'altorouter/altorouter' => array( + 'pretty_version' => 'v1.1.0', + 'version' => '1.1.0.0', + 'reference' => '09d9d946c546bae6d22a7654cdb3b825ffda54b4', + 'type' => 'library', + 'install_path' => __DIR__ . '/../altorouter/altorouter', + 'aliases' => array(), + 'dev_requirement' => false, + ), 'doctrine/instantiator' => array( 'pretty_version' => '1.5.0', 'version' => '1.5.0.0', @@ -19,10 +28,19 @@ 'aliases' => array(), 'dev_requirement' => true, ), + 'graham-campbell/result-type' => array( + 'pretty_version' => 'v1.1.2', + 'version' => '1.1.2.0', + 'reference' => 'fbd48bce38f73f8a4ec8583362e732e4095e5862', + 'type' => 'library', + 'install_path' => __DIR__ . '/../graham-campbell/result-type', + 'aliases' => array(), + 'dev_requirement' => false, + ), 'hearttrack/package' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '03e37247f2bc193deb0684e154c42c29a7fc9ea2', + 'reference' => '79311b1041e6dc02c8f58f9bc46bc20ba368ed58', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -64,6 +82,15 @@ 'aliases' => array(), 'dev_requirement' => true, ), + 'phpoption/phpoption' => array( + 'pretty_version' => '1.9.2', + 'version' => '1.9.2.0', + 'reference' => '80735db690fe4fc5c76dfa7f9b770634285fa820', + 'type' => 'library', + 'install_path' => __DIR__ . '/../phpoption/phpoption', + 'aliases' => array(), + 'dev_requirement' => false, + ), 'phpunit/php-code-coverage' => array( 'pretty_version' => '9.2.29', 'version' => '9.2.29.0', @@ -118,6 +145,15 @@ 'aliases' => array(), 'dev_requirement' => true, ), + 'psr/container' => array( + 'pretty_version' => '2.0.2', + 'version' => '2.0.2.0', + 'reference' => 'c71ecc56dfe541dbd90c5360474fbc405f8d5963', + 'type' => 'library', + 'install_path' => __DIR__ . '/../psr/container', + 'aliases' => array(), + 'dev_requirement' => false, + ), 'sebastian/cli-parser' => array( 'pretty_version' => '1.0.1', 'version' => '1.0.1.0', @@ -280,23 +316,41 @@ 'aliases' => array(), 'dev_requirement' => false, ), + 'symfony/polyfill-php80' => array( + 'pretty_version' => 'v1.28.0', + 'version' => '1.28.0.0', + 'reference' => '6caa57379c4aec19c0a12a38b59b26487dcfe4b5', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/polyfill-php80', + 'aliases' => array(), + 'dev_requirement' => false, + ), 'theseer/tokenizer' => array( - 'pretty_version' => '1.2.1', - 'version' => '1.2.1.0', - 'reference' => '34a41e998c2183e22995f158c581e7b5e755ab9e', + 'pretty_version' => '1.2.2', + 'version' => '1.2.2.0', + 'reference' => 'b2ad5003ca10d4ee50a12da31de12a5774ba6b96', 'type' => 'library', 'install_path' => __DIR__ . '/../theseer/tokenizer', 'aliases' => array(), 'dev_requirement' => true, ), 'twig/twig' => array( - 'pretty_version' => 'v3.7.1', - 'version' => '3.7.1.0', - 'reference' => 'a0ce373a0ca3bf6c64b9e3e2124aca502ba39554', + 'pretty_version' => 'v3.8.0', + 'version' => '3.8.0.0', + 'reference' => '9d15f0ac07f44dc4217883ec6ae02fd555c6f71d', 'type' => 'library', 'install_path' => __DIR__ . '/../twig/twig', 'aliases' => array(), 'dev_requirement' => false, ), + 'vlucas/phpdotenv' => array( + 'pretty_version' => 'v5.6.0', + 'version' => '5.6.0.0', + 'reference' => '2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4', + 'type' => 'library', + 'install_path' => __DIR__ . '/../vlucas/phpdotenv', + 'aliases' => array(), + 'dev_requirement' => false, + ), ), ); diff --git a/Sources/vendor/composer/platform_check.php b/Sources/vendor/composer/platform_check.php index a8b98d5c..580fa960 100755 --- a/Sources/vendor/composer/platform_check.php +++ b/Sources/vendor/composer/platform_check.php @@ -4,8 +4,8 @@ $issues = array(); -if (!(PHP_VERSION_ID >= 70205)) { - $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.5". You are running ' . PHP_VERSION . '.'; +if (!(PHP_VERSION_ID >= 70400)) { + $issues[] = 'Your Composer dependencies require a PHP version ">= 7.4.0". You are running ' . PHP_VERSION . '.'; } if ($issues) { diff --git a/Sources/vendor/graham-campbell/result-type/LICENSE b/Sources/vendor/graham-campbell/result-type/LICENSE new file mode 100644 index 00000000..bbd75d13 --- /dev/null +++ b/Sources/vendor/graham-campbell/result-type/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2020-2023 Graham Campbell + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/Sources/vendor/graham-campbell/result-type/composer.json b/Sources/vendor/graham-campbell/result-type/composer.json new file mode 100644 index 00000000..b1ba15ab --- /dev/null +++ b/Sources/vendor/graham-campbell/result-type/composer.json @@ -0,0 +1,33 @@ +{ + "name": "graham-campbell/result-type", + "description": "An Implementation Of The Result Type", + "keywords": ["result", "result-type", "Result", "Result Type", "Result-Type", "Graham Campbell", "GrahamCampbell"], + "license": "MIT", + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + } + ], + "require": { + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + }, + "autoload": { + "psr-4": { + "GrahamCampbell\\ResultType\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "GrahamCampbell\\Tests\\ResultType\\": "tests/" + } + }, + "config": { + "preferred-install": "dist" + } +} diff --git a/Sources/vendor/graham-campbell/result-type/src/Error.php b/Sources/vendor/graham-campbell/result-type/src/Error.php new file mode 100644 index 00000000..2c37c3e2 --- /dev/null +++ b/Sources/vendor/graham-campbell/result-type/src/Error.php @@ -0,0 +1,121 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace GrahamCampbell\ResultType; + +use PhpOption\None; +use PhpOption\Some; + +/** + * @template T + * @template E + * + * @extends \GrahamCampbell\ResultType\Result + */ +final class Error extends Result +{ + /** + * @var E + */ + private $value; + + /** + * Internal constructor for an error value. + * + * @param E $value + * + * @return void + */ + private function __construct($value) + { + $this->value = $value; + } + + /** + * Create a new error value. + * + * @template F + * + * @param F $value + * + * @return \GrahamCampbell\ResultType\Result + */ + public static function create($value) + { + return new self($value); + } + + /** + * Get the success option value. + * + * @return \PhpOption\Option + */ + public function success() + { + return None::create(); + } + + /** + * Map over the success value. + * + * @template S + * + * @param callable(T):S $f + * + * @return \GrahamCampbell\ResultType\Result + */ + public function map(callable $f) + { + return self::create($this->value); + } + + /** + * Flat map over the success value. + * + * @template S + * @template F + * + * @param callable(T):\GrahamCampbell\ResultType\Result $f + * + * @return \GrahamCampbell\ResultType\Result + */ + public function flatMap(callable $f) + { + /** @var \GrahamCampbell\ResultType\Result */ + return self::create($this->value); + } + + /** + * Get the error option value. + * + * @return \PhpOption\Option + */ + public function error() + { + return Some::create($this->value); + } + + /** + * Map over the error value. + * + * @template F + * + * @param callable(E):F $f + * + * @return \GrahamCampbell\ResultType\Result + */ + public function mapError(callable $f) + { + return self::create($f($this->value)); + } +} diff --git a/Sources/vendor/graham-campbell/result-type/src/Result.php b/Sources/vendor/graham-campbell/result-type/src/Result.php new file mode 100644 index 00000000..8c67bcdd --- /dev/null +++ b/Sources/vendor/graham-campbell/result-type/src/Result.php @@ -0,0 +1,69 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace GrahamCampbell\ResultType; + +/** + * @template T + * @template E + */ +abstract class Result +{ + /** + * Get the success option value. + * + * @return \PhpOption\Option + */ + abstract public function success(); + + /** + * Map over the success value. + * + * @template S + * + * @param callable(T):S $f + * + * @return \GrahamCampbell\ResultType\Result + */ + abstract public function map(callable $f); + + /** + * Flat map over the success value. + * + * @template S + * @template F + * + * @param callable(T):\GrahamCampbell\ResultType\Result $f + * + * @return \GrahamCampbell\ResultType\Result + */ + abstract public function flatMap(callable $f); + + /** + * Get the error option value. + * + * @return \PhpOption\Option + */ + abstract public function error(); + + /** + * Map over the error value. + * + * @template F + * + * @param callable(E):F $f + * + * @return \GrahamCampbell\ResultType\Result + */ + abstract public function mapError(callable $f); +} diff --git a/Sources/vendor/graham-campbell/result-type/src/Success.php b/Sources/vendor/graham-campbell/result-type/src/Success.php new file mode 100644 index 00000000..27cd85ee --- /dev/null +++ b/Sources/vendor/graham-campbell/result-type/src/Success.php @@ -0,0 +1,120 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace GrahamCampbell\ResultType; + +use PhpOption\None; +use PhpOption\Some; + +/** + * @template T + * @template E + * + * @extends \GrahamCampbell\ResultType\Result + */ +final class Success extends Result +{ + /** + * @var T + */ + private $value; + + /** + * Internal constructor for a success value. + * + * @param T $value + * + * @return void + */ + private function __construct($value) + { + $this->value = $value; + } + + /** + * Create a new error value. + * + * @template S + * + * @param S $value + * + * @return \GrahamCampbell\ResultType\Result + */ + public static function create($value) + { + return new self($value); + } + + /** + * Get the success option value. + * + * @return \PhpOption\Option + */ + public function success() + { + return Some::create($this->value); + } + + /** + * Map over the success value. + * + * @template S + * + * @param callable(T):S $f + * + * @return \GrahamCampbell\ResultType\Result + */ + public function map(callable $f) + { + return self::create($f($this->value)); + } + + /** + * Flat map over the success value. + * + * @template S + * @template F + * + * @param callable(T):\GrahamCampbell\ResultType\Result $f + * + * @return \GrahamCampbell\ResultType\Result + */ + public function flatMap(callable $f) + { + return $f($this->value); + } + + /** + * Get the error option value. + * + * @return \PhpOption\Option + */ + public function error() + { + return None::create(); + } + + /** + * Map over the error value. + * + * @template F + * + * @param callable(E):F $f + * + * @return \GrahamCampbell\ResultType\Result + */ + public function mapError(callable $f) + { + return self::create($this->value); + } +} diff --git a/Sources/vendor/phpoption/phpoption/LICENSE b/Sources/vendor/phpoption/phpoption/LICENSE new file mode 100644 index 00000000..f49a4e16 --- /dev/null +++ b/Sources/vendor/phpoption/phpoption/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/Sources/vendor/phpoption/phpoption/composer.json b/Sources/vendor/phpoption/phpoption/composer.json new file mode 100644 index 00000000..77f50a37 --- /dev/null +++ b/Sources/vendor/phpoption/phpoption/composer.json @@ -0,0 +1,52 @@ +{ + "name": "phpoption/phpoption", + "description": "Option Type for PHP", + "keywords": ["php", "option", "language", "type"], + "license": "Apache-2.0", + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh" + }, + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + } + ], + "require": { + "php": "^7.2.5 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" + }, + "autoload": { + "psr-4": { + "PhpOption\\": "src/PhpOption/" + } + }, + "autoload-dev": { + "psr-4": { + "PhpOption\\Tests\\": "tests/PhpOption/Tests/" + } + }, + "config": { + "allow-plugins": { + "bamarni/composer-bin-plugin": true + }, + "preferred-install": "dist" + }, + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/Sources/vendor/phpoption/phpoption/src/PhpOption/LazyOption.php b/Sources/vendor/phpoption/phpoption/src/PhpOption/LazyOption.php new file mode 100644 index 00000000..9cb77c86 --- /dev/null +++ b/Sources/vendor/phpoption/phpoption/src/PhpOption/LazyOption.php @@ -0,0 +1,175 @@ + + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace PhpOption; + +use Traversable; + +/** + * @template T + * + * @extends Option + */ +final class LazyOption extends Option +{ + /** @var callable(mixed...):(Option) */ + private $callback; + + /** @var array */ + private $arguments; + + /** @var Option|null */ + private $option; + + /** + * @template S + * @param callable(mixed...):(Option) $callback + * @param array $arguments + * + * @return LazyOption + */ + public static function create($callback, array $arguments = []): self + { + return new self($callback, $arguments); + } + + /** + * @param callable(mixed...):(Option) $callback + * @param array $arguments + */ + public function __construct($callback, array $arguments = []) + { + if (!is_callable($callback)) { + throw new \InvalidArgumentException('Invalid callback given'); + } + + $this->callback = $callback; + $this->arguments = $arguments; + } + + public function isDefined(): bool + { + return $this->option()->isDefined(); + } + + public function isEmpty(): bool + { + return $this->option()->isEmpty(); + } + + public function get() + { + return $this->option()->get(); + } + + public function getOrElse($default) + { + return $this->option()->getOrElse($default); + } + + public function getOrCall($callable) + { + return $this->option()->getOrCall($callable); + } + + public function getOrThrow(\Exception $ex) + { + return $this->option()->getOrThrow($ex); + } + + public function orElse(Option $else) + { + return $this->option()->orElse($else); + } + + public function ifDefined($callable) + { + $this->option()->forAll($callable); + } + + public function forAll($callable) + { + return $this->option()->forAll($callable); + } + + public function map($callable) + { + return $this->option()->map($callable); + } + + public function flatMap($callable) + { + return $this->option()->flatMap($callable); + } + + public function filter($callable) + { + return $this->option()->filter($callable); + } + + public function filterNot($callable) + { + return $this->option()->filterNot($callable); + } + + public function select($value) + { + return $this->option()->select($value); + } + + public function reject($value) + { + return $this->option()->reject($value); + } + + /** + * @return Traversable + */ + public function getIterator(): Traversable + { + return $this->option()->getIterator(); + } + + public function foldLeft($initialValue, $callable) + { + return $this->option()->foldLeft($initialValue, $callable); + } + + public function foldRight($initialValue, $callable) + { + return $this->option()->foldRight($initialValue, $callable); + } + + /** + * @return Option + */ + private function option(): Option + { + if (null === $this->option) { + /** @var mixed */ + $option = call_user_func_array($this->callback, $this->arguments); + if ($option instanceof Option) { + $this->option = $option; + } else { + throw new \RuntimeException(sprintf('Expected instance of %s', Option::class)); + } + } + + return $this->option; + } +} diff --git a/Sources/vendor/phpoption/phpoption/src/PhpOption/None.php b/Sources/vendor/phpoption/phpoption/src/PhpOption/None.php new file mode 100644 index 00000000..4b85d22d --- /dev/null +++ b/Sources/vendor/phpoption/phpoption/src/PhpOption/None.php @@ -0,0 +1,136 @@ + + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace PhpOption; + +use EmptyIterator; + +/** + * @extends Option + */ +final class None extends Option +{ + /** @var None|null */ + private static $instance; + + /** + * @return None + */ + public static function create(): self + { + if (null === self::$instance) { + self::$instance = new self(); + } + + return self::$instance; + } + + public function get() + { + throw new \RuntimeException('None has no value.'); + } + + public function getOrCall($callable) + { + return $callable(); + } + + public function getOrElse($default) + { + return $default; + } + + public function getOrThrow(\Exception $ex) + { + throw $ex; + } + + public function isEmpty(): bool + { + return true; + } + + public function isDefined(): bool + { + return false; + } + + public function orElse(Option $else) + { + return $else; + } + + public function ifDefined($callable) + { + // Just do nothing in that case. + } + + public function forAll($callable) + { + return $this; + } + + public function map($callable) + { + return $this; + } + + public function flatMap($callable) + { + return $this; + } + + public function filter($callable) + { + return $this; + } + + public function filterNot($callable) + { + return $this; + } + + public function select($value) + { + return $this; + } + + public function reject($value) + { + return $this; + } + + public function getIterator(): EmptyIterator + { + return new EmptyIterator(); + } + + public function foldLeft($initialValue, $callable) + { + return $initialValue; + } + + public function foldRight($initialValue, $callable) + { + return $initialValue; + } + + private function __construct() + { + } +} diff --git a/Sources/vendor/phpoption/phpoption/src/PhpOption/Option.php b/Sources/vendor/phpoption/phpoption/src/PhpOption/Option.php new file mode 100644 index 00000000..172924cf --- /dev/null +++ b/Sources/vendor/phpoption/phpoption/src/PhpOption/Option.php @@ -0,0 +1,434 @@ + + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace PhpOption; + +use ArrayAccess; +use IteratorAggregate; + +/** + * @template T + * + * @implements IteratorAggregate + */ +abstract class Option implements IteratorAggregate +{ + /** + * Creates an option given a return value. + * + * This is intended for consuming existing APIs and allows you to easily + * convert them to an option. By default, we treat ``null`` as the None + * case, and everything else as Some. + * + * @template S + * + * @param S $value The actual return value. + * @param S $noneValue The value which should be considered "None"; null by + * default. + * + * @return Option + */ + public static function fromValue($value, $noneValue = null) + { + if ($value === $noneValue) { + return None::create(); + } + + return new Some($value); + } + + /** + * Creates an option from an array's value. + * + * If the key does not exist in the array, the array is not actually an + * array, or the array's value at the given key is null, None is returned. + * Otherwise, Some is returned wrapping the value at the given key. + * + * @template S + * + * @param array|ArrayAccess|null $array A potential array or \ArrayAccess value. + * @param string $key The key to check. + * + * @return Option + */ + public static function fromArraysValue($array, $key) + { + if (!(is_array($array) || $array instanceof ArrayAccess) || !isset($array[$key])) { + return None::create(); + } + + return new Some($array[$key]); + } + + /** + * Creates a lazy-option with the given callback. + * + * This is also a helper constructor for lazy-consuming existing APIs where + * the return value is not yet an option. By default, we treat ``null`` as + * None case, and everything else as Some. + * + * @template S + * + * @param callable $callback The callback to evaluate. + * @param array $arguments The arguments for the callback. + * @param S $noneValue The value which should be considered "None"; + * null by default. + * + * @return LazyOption + */ + public static function fromReturn($callback, array $arguments = [], $noneValue = null) + { + return new LazyOption(static function () use ($callback, $arguments, $noneValue) { + /** @var mixed */ + $return = call_user_func_array($callback, $arguments); + + if ($return === $noneValue) { + return None::create(); + } + + return new Some($return); + }); + } + + /** + * Option factory, which creates new option based on passed value. + * + * If value is already an option, it simply returns. If value is callable, + * LazyOption with passed callback created and returned. If Option + * returned from callback, it returns directly. On other case value passed + * to Option::fromValue() method. + * + * @template S + * + * @param Option|callable|S $value + * @param S $noneValue Used when $value is mixed or + * callable, for None-check. + * + * @return Option|LazyOption + */ + public static function ensure($value, $noneValue = null) + { + if ($value instanceof self) { + return $value; + } elseif (is_callable($value)) { + return new LazyOption(static function () use ($value, $noneValue) { + /** @var mixed */ + $return = $value(); + + if ($return instanceof self) { + return $return; + } else { + return self::fromValue($return, $noneValue); + } + }); + } else { + return self::fromValue($value, $noneValue); + } + } + + /** + * Lift a function so that it accepts Option as parameters. + * + * We return a new closure that wraps the original callback. If any of the + * parameters passed to the lifted function is empty, the function will + * return a value of None. Otherwise, we will pass all parameters to the + * original callback and return the value inside a new Option, unless an + * Option is returned from the function, in which case, we use that. + * + * @template S + * + * @param callable $callback + * @param mixed $noneValue + * + * @return callable + */ + public static function lift($callback, $noneValue = null) + { + return static function () use ($callback, $noneValue) { + /** @var array */ + $args = func_get_args(); + + $reduced_args = array_reduce( + $args, + /** @param bool $status */ + static function ($status, self $o) { + return $o->isEmpty() ? true : $status; + }, + false + ); + // if at least one parameter is empty, return None + if ($reduced_args) { + return None::create(); + } + + $args = array_map( + /** @return T */ + static function (self $o) { + // it is safe to do so because the fold above checked + // that all arguments are of type Some + /** @var T */ + return $o->get(); + }, + $args + ); + + return self::ensure(call_user_func_array($callback, $args), $noneValue); + }; + } + + /** + * Returns the value if available, or throws an exception otherwise. + * + * @throws \RuntimeException If value is not available. + * + * @return T + */ + abstract public function get(); + + /** + * Returns the value if available, or the default value if not. + * + * @template S + * + * @param S $default + * + * @return T|S + */ + abstract public function getOrElse($default); + + /** + * Returns the value if available, or the results of the callable. + * + * This is preferable over ``getOrElse`` if the computation of the default + * value is expensive. + * + * @template S + * + * @param callable():S $callable + * + * @return T|S + */ + abstract public function getOrCall($callable); + + /** + * Returns the value if available, or throws the passed exception. + * + * @param \Exception $ex + * + * @return T + */ + abstract public function getOrThrow(\Exception $ex); + + /** + * Returns true if no value is available, false otherwise. + * + * @return bool + */ + abstract public function isEmpty(); + + /** + * Returns true if a value is available, false otherwise. + * + * @return bool + */ + abstract public function isDefined(); + + /** + * Returns this option if non-empty, or the passed option otherwise. + * + * This can be used to try multiple alternatives, and is especially useful + * with lazy evaluating options: + * + * ```php + * $repo->findSomething() + * ->orElse(new LazyOption(array($repo, 'findSomethingElse'))) + * ->orElse(new LazyOption(array($repo, 'createSomething'))); + * ``` + * + * @param Option $else + * + * @return Option + */ + abstract public function orElse(self $else); + + /** + * This is similar to map() below except that the return value has no meaning; + * the passed callable is simply executed if the option is non-empty, and + * ignored if the option is empty. + * + * In all cases, the return value of the callable is discarded. + * + * ```php + * $comment->getMaybeFile()->ifDefined(function($file) { + * // Do something with $file here. + * }); + * ``` + * + * If you're looking for something like ``ifEmpty``, you can use ``getOrCall`` + * and ``getOrElse`` in these cases. + * + * @deprecated Use forAll() instead. + * + * @param callable(T):mixed $callable + * + * @return void + */ + abstract public function ifDefined($callable); + + /** + * This is similar to map() except that the return value of the callable has no meaning. + * + * The passed callable is simply executed if the option is non-empty, and ignored if the + * option is empty. This method is preferred for callables with side-effects, while map() + * is intended for callables without side-effects. + * + * @param callable(T):mixed $callable + * + * @return Option + */ + abstract public function forAll($callable); + + /** + * Applies the callable to the value of the option if it is non-empty, + * and returns the return value of the callable wrapped in Some(). + * + * If the option is empty, then the callable is not applied. + * + * ```php + * (new Some("foo"))->map('strtoupper')->get(); // "FOO" + * ``` + * + * @template S + * + * @param callable(T):S $callable + * + * @return Option + */ + abstract public function map($callable); + + /** + * Applies the callable to the value of the option if it is non-empty, and + * returns the return value of the callable directly. + * + * In contrast to ``map``, the return value of the callable is expected to + * be an Option itself; it is not automatically wrapped in Some(). + * + * @template S + * + * @param callable(T):Option $callable must return an Option + * + * @return Option + */ + abstract public function flatMap($callable); + + /** + * If the option is empty, it is returned immediately without applying the callable. + * + * If the option is non-empty, the callable is applied, and if it returns true, + * the option itself is returned; otherwise, None is returned. + * + * @param callable(T):bool $callable + * + * @return Option + */ + abstract public function filter($callable); + + /** + * If the option is empty, it is returned immediately without applying the callable. + * + * If the option is non-empty, the callable is applied, and if it returns false, + * the option itself is returned; otherwise, None is returned. + * + * @param callable(T):bool $callable + * + * @return Option + */ + abstract public function filterNot($callable); + + /** + * If the option is empty, it is returned immediately. + * + * If the option is non-empty, and its value does not equal the passed value + * (via a shallow comparison ===), then None is returned. Otherwise, the + * Option is returned. + * + * In other words, this will filter all but the passed value. + * + * @param T $value + * + * @return Option + */ + abstract public function select($value); + + /** + * If the option is empty, it is returned immediately. + * + * If the option is non-empty, and its value does equal the passed value (via + * a shallow comparison ===), then None is returned; otherwise, the Option is + * returned. + * + * In other words, this will let all values through except the passed value. + * + * @param T $value + * + * @return Option + */ + abstract public function reject($value); + + /** + * Binary operator for the initial value and the option's value. + * + * If empty, the initial value is returned. If non-empty, the callable + * receives the initial value and the option's value as arguments. + * + * ```php + * + * $some = new Some(5); + * $none = None::create(); + * $result = $some->foldLeft(1, function($a, $b) { return $a + $b; }); // int(6) + * $result = $none->foldLeft(1, function($a, $b) { return $a + $b; }); // int(1) + * + * // This can be used instead of something like the following: + * $option = Option::fromValue($integerOrNull); + * $result = 1; + * if ( ! $option->isEmpty()) { + * $result += $option->get(); + * } + * ``` + * + * @template S + * + * @param S $initialValue + * @param callable(S, T):S $callable + * + * @return S + */ + abstract public function foldLeft($initialValue, $callable); + + /** + * foldLeft() but with reversed arguments for the callable. + * + * @template S + * + * @param S $initialValue + * @param callable(T, S):S $callable + * + * @return S + */ + abstract public function foldRight($initialValue, $callable); +} diff --git a/Sources/vendor/phpoption/phpoption/src/PhpOption/Some.php b/Sources/vendor/phpoption/phpoption/src/PhpOption/Some.php new file mode 100644 index 00000000..032632ea --- /dev/null +++ b/Sources/vendor/phpoption/phpoption/src/PhpOption/Some.php @@ -0,0 +1,169 @@ + + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace PhpOption; + +use ArrayIterator; + +/** + * @template T + * + * @extends Option + */ +final class Some extends Option +{ + /** @var T */ + private $value; + + /** + * @param T $value + */ + public function __construct($value) + { + $this->value = $value; + } + + /** + * @template U + * + * @param U $value + * + * @return Some + */ + public static function create($value): self + { + return new self($value); + } + + public function isDefined(): bool + { + return true; + } + + public function isEmpty(): bool + { + return false; + } + + public function get() + { + return $this->value; + } + + public function getOrElse($default) + { + return $this->value; + } + + public function getOrCall($callable) + { + return $this->value; + } + + public function getOrThrow(\Exception $ex) + { + return $this->value; + } + + public function orElse(Option $else) + { + return $this; + } + + public function ifDefined($callable) + { + $this->forAll($callable); + } + + public function forAll($callable) + { + $callable($this->value); + + return $this; + } + + public function map($callable) + { + return new self($callable($this->value)); + } + + public function flatMap($callable) + { + /** @var mixed */ + $rs = $callable($this->value); + if (!$rs instanceof Option) { + throw new \RuntimeException('Callables passed to flatMap() must return an Option. Maybe you should use map() instead?'); + } + + return $rs; + } + + public function filter($callable) + { + if (true === $callable($this->value)) { + return $this; + } + + return None::create(); + } + + public function filterNot($callable) + { + if (false === $callable($this->value)) { + return $this; + } + + return None::create(); + } + + public function select($value) + { + if ($this->value === $value) { + return $this; + } + + return None::create(); + } + + public function reject($value) + { + if ($this->value === $value) { + return None::create(); + } + + return $this; + } + + /** + * @return ArrayIterator + */ + public function getIterator(): ArrayIterator + { + return new ArrayIterator([$this->value]); + } + + public function foldLeft($initialValue, $callable) + { + return $callable($initialValue, $this->value); + } + + public function foldRight($initialValue, $callable) + { + return $callable($this->value, $initialValue); + } +} diff --git a/Sources/vendor/psr/container/.gitignore b/Sources/vendor/psr/container/.gitignore new file mode 100644 index 00000000..b2395aa0 --- /dev/null +++ b/Sources/vendor/psr/container/.gitignore @@ -0,0 +1,3 @@ +composer.lock +composer.phar +/vendor/ diff --git a/Sources/vendor/psr/container/LICENSE b/Sources/vendor/psr/container/LICENSE new file mode 100644 index 00000000..2877a489 --- /dev/null +++ b/Sources/vendor/psr/container/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-2016 container-interop +Copyright (c) 2016 PHP Framework Interoperability Group + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Sources/vendor/psr/container/README.md b/Sources/vendor/psr/container/README.md new file mode 100644 index 00000000..1b9d9e57 --- /dev/null +++ b/Sources/vendor/psr/container/README.md @@ -0,0 +1,13 @@ +Container interface +============== + +This repository holds all interfaces related to [PSR-11 (Container Interface)][psr-url]. + +Note that this is not a Container implementation of its own. It is merely abstractions that describe the components of a Dependency Injection Container. + +The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist. + +[psr-url]: https://www.php-fig.org/psr/psr-11/ +[package-url]: https://packagist.org/packages/psr/container +[implementation-url]: https://packagist.org/providers/psr/container-implementation + diff --git a/Sources/vendor/psr/container/composer.json b/Sources/vendor/psr/container/composer.json new file mode 100644 index 00000000..baf6cd1a --- /dev/null +++ b/Sources/vendor/psr/container/composer.json @@ -0,0 +1,27 @@ +{ + "name": "psr/container", + "type": "library", + "description": "Common Container Interface (PHP FIG PSR-11)", + "keywords": ["psr", "psr-11", "container", "container-interop", "container-interface"], + "homepage": "https://github.com/php-fig/container", + "license": "MIT", + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "require": { + "php": ">=7.4.0" + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + } +} diff --git a/Sources/vendor/psr/container/src/ContainerExceptionInterface.php b/Sources/vendor/psr/container/src/ContainerExceptionInterface.php new file mode 100644 index 00000000..0f213f2f --- /dev/null +++ b/Sources/vendor/psr/container/src/ContainerExceptionInterface.php @@ -0,0 +1,12 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Polyfill\Php80; + +/** + * @author Ion Bazan + * @author Nico Oelgart + * @author Nicolas Grekas + * + * @internal + */ +final class Php80 +{ + public static function fdiv(float $dividend, float $divisor): float + { + return @($dividend / $divisor); + } + + public static function get_debug_type($value): string + { + switch (true) { + case null === $value: return 'null'; + case \is_bool($value): return 'bool'; + case \is_string($value): return 'string'; + case \is_array($value): return 'array'; + case \is_int($value): return 'int'; + case \is_float($value): return 'float'; + case \is_object($value): break; + case $value instanceof \__PHP_Incomplete_Class: return '__PHP_Incomplete_Class'; + default: + if (null === $type = @get_resource_type($value)) { + return 'unknown'; + } + + if ('Unknown' === $type) { + $type = 'closed'; + } + + return "resource ($type)"; + } + + $class = \get_class($value); + + if (false === strpos($class, '@')) { + return $class; + } + + return (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous'; + } + + public static function get_resource_id($res): int + { + if (!\is_resource($res) && null === @get_resource_type($res)) { + throw new \TypeError(sprintf('Argument 1 passed to get_resource_id() must be of the type resource, %s given', get_debug_type($res))); + } + + return (int) $res; + } + + public static function preg_last_error_msg(): string + { + switch (preg_last_error()) { + case \PREG_INTERNAL_ERROR: + return 'Internal error'; + case \PREG_BAD_UTF8_ERROR: + return 'Malformed UTF-8 characters, possibly incorrectly encoded'; + case \PREG_BAD_UTF8_OFFSET_ERROR: + return 'The offset did not correspond to the beginning of a valid UTF-8 code point'; + case \PREG_BACKTRACK_LIMIT_ERROR: + return 'Backtrack limit exhausted'; + case \PREG_RECURSION_LIMIT_ERROR: + return 'Recursion limit exhausted'; + case \PREG_JIT_STACKLIMIT_ERROR: + return 'JIT stack limit exhausted'; + case \PREG_NO_ERROR: + return 'No error'; + default: + return 'Unknown error'; + } + } + + public static function str_contains(string $haystack, string $needle): bool + { + return '' === $needle || false !== strpos($haystack, $needle); + } + + public static function str_starts_with(string $haystack, string $needle): bool + { + return 0 === strncmp($haystack, $needle, \strlen($needle)); + } + + public static function str_ends_with(string $haystack, string $needle): bool + { + if ('' === $needle || $needle === $haystack) { + return true; + } + + if ('' === $haystack) { + return false; + } + + $needleLength = \strlen($needle); + + return $needleLength <= \strlen($haystack) && 0 === substr_compare($haystack, $needle, -$needleLength); + } +} diff --git a/Sources/vendor/symfony/polyfill-php80/PhpToken.php b/Sources/vendor/symfony/polyfill-php80/PhpToken.php new file mode 100644 index 00000000..fe6e6910 --- /dev/null +++ b/Sources/vendor/symfony/polyfill-php80/PhpToken.php @@ -0,0 +1,103 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Polyfill\Php80; + +/** + * @author Fedonyuk Anton + * + * @internal + */ +class PhpToken implements \Stringable +{ + /** + * @var int + */ + public $id; + + /** + * @var string + */ + public $text; + + /** + * @var int + */ + public $line; + + /** + * @var int + */ + public $pos; + + public function __construct(int $id, string $text, int $line = -1, int $position = -1) + { + $this->id = $id; + $this->text = $text; + $this->line = $line; + $this->pos = $position; + } + + public function getTokenName(): ?string + { + if ('UNKNOWN' === $name = token_name($this->id)) { + $name = \strlen($this->text) > 1 || \ord($this->text) < 32 ? null : $this->text; + } + + return $name; + } + + /** + * @param int|string|array $kind + */ + public function is($kind): bool + { + foreach ((array) $kind as $value) { + if (\in_array($value, [$this->id, $this->text], true)) { + return true; + } + } + + return false; + } + + public function isIgnorable(): bool + { + return \in_array($this->id, [\T_WHITESPACE, \T_COMMENT, \T_DOC_COMMENT, \T_OPEN_TAG], true); + } + + public function __toString(): string + { + return (string) $this->text; + } + + /** + * @return static[] + */ + public static function tokenize(string $code, int $flags = 0): array + { + $line = 1; + $position = 0; + $tokens = token_get_all($code, $flags); + foreach ($tokens as $index => $token) { + if (\is_string($token)) { + $id = \ord($token); + $text = $token; + } else { + [$id, $text, $line] = $token; + } + $tokens[$index] = new static($id, $text, $line, $position); + $position += \strlen($text); + } + + return $tokens; + } +} diff --git a/Sources/vendor/symfony/polyfill-php80/README.md b/Sources/vendor/symfony/polyfill-php80/README.md new file mode 100644 index 00000000..3816c559 --- /dev/null +++ b/Sources/vendor/symfony/polyfill-php80/README.md @@ -0,0 +1,25 @@ +Symfony Polyfill / Php80 +======================== + +This component provides features added to PHP 8.0 core: + +- [`Stringable`](https://php.net/stringable) interface +- [`fdiv`](https://php.net/fdiv) +- [`ValueError`](https://php.net/valueerror) class +- [`UnhandledMatchError`](https://php.net/unhandledmatcherror) class +- `FILTER_VALIDATE_BOOL` constant +- [`get_debug_type`](https://php.net/get_debug_type) +- [`PhpToken`](https://php.net/phptoken) class +- [`preg_last_error_msg`](https://php.net/preg_last_error_msg) +- [`str_contains`](https://php.net/str_contains) +- [`str_starts_with`](https://php.net/str_starts_with) +- [`str_ends_with`](https://php.net/str_ends_with) +- [`get_resource_id`](https://php.net/get_resource_id) + +More information can be found in the +[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md). + +License +======= + +This library is released under the [MIT license](LICENSE). diff --git a/Sources/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php b/Sources/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php new file mode 100644 index 00000000..2b955423 --- /dev/null +++ b/Sources/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +#[Attribute(Attribute::TARGET_CLASS)] +final class Attribute +{ + public const TARGET_CLASS = 1; + public const TARGET_FUNCTION = 2; + public const TARGET_METHOD = 4; + public const TARGET_PROPERTY = 8; + public const TARGET_CLASS_CONSTANT = 16; + public const TARGET_PARAMETER = 32; + public const TARGET_ALL = 63; + public const IS_REPEATABLE = 64; + + /** @var int */ + public $flags; + + public function __construct(int $flags = self::TARGET_ALL) + { + $this->flags = $flags; + } +} diff --git a/Sources/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php b/Sources/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php new file mode 100644 index 00000000..bd1212f6 --- /dev/null +++ b/Sources/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php @@ -0,0 +1,16 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +if (\PHP_VERSION_ID < 80000 && extension_loaded('tokenizer')) { + class PhpToken extends Symfony\Polyfill\Php80\PhpToken + { + } +} diff --git a/Sources/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php b/Sources/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php new file mode 100644 index 00000000..7c62d750 --- /dev/null +++ b/Sources/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +if (\PHP_VERSION_ID < 80000) { + interface Stringable + { + /** + * @return string + */ + public function __toString(); + } +} diff --git a/Sources/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php b/Sources/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php new file mode 100644 index 00000000..01c6c6c8 --- /dev/null +++ b/Sources/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php @@ -0,0 +1,16 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +if (\PHP_VERSION_ID < 80000) { + class UnhandledMatchError extends Error + { + } +} diff --git a/Sources/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php b/Sources/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php new file mode 100644 index 00000000..783dbc28 --- /dev/null +++ b/Sources/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php @@ -0,0 +1,16 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +if (\PHP_VERSION_ID < 80000) { + class ValueError extends Error + { + } +} diff --git a/Sources/vendor/symfony/polyfill-php80/bootstrap.php b/Sources/vendor/symfony/polyfill-php80/bootstrap.php new file mode 100644 index 00000000..e5f7dbc1 --- /dev/null +++ b/Sources/vendor/symfony/polyfill-php80/bootstrap.php @@ -0,0 +1,42 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +use Symfony\Polyfill\Php80 as p; + +if (\PHP_VERSION_ID >= 80000) { + return; +} + +if (!defined('FILTER_VALIDATE_BOOL') && defined('FILTER_VALIDATE_BOOLEAN')) { + define('FILTER_VALIDATE_BOOL', \FILTER_VALIDATE_BOOLEAN); +} + +if (!function_exists('fdiv')) { + function fdiv(float $num1, float $num2): float { return p\Php80::fdiv($num1, $num2); } +} +if (!function_exists('preg_last_error_msg')) { + function preg_last_error_msg(): string { return p\Php80::preg_last_error_msg(); } +} +if (!function_exists('str_contains')) { + function str_contains(?string $haystack, ?string $needle): bool { return p\Php80::str_contains($haystack ?? '', $needle ?? ''); } +} +if (!function_exists('str_starts_with')) { + function str_starts_with(?string $haystack, ?string $needle): bool { return p\Php80::str_starts_with($haystack ?? '', $needle ?? ''); } +} +if (!function_exists('str_ends_with')) { + function str_ends_with(?string $haystack, ?string $needle): bool { return p\Php80::str_ends_with($haystack ?? '', $needle ?? ''); } +} +if (!function_exists('get_debug_type')) { + function get_debug_type($value): string { return p\Php80::get_debug_type($value); } +} +if (!function_exists('get_resource_id')) { + function get_resource_id($resource): int { return p\Php80::get_resource_id($resource); } +} diff --git a/Sources/vendor/symfony/polyfill-php80/composer.json b/Sources/vendor/symfony/polyfill-php80/composer.json new file mode 100644 index 00000000..f1801f40 --- /dev/null +++ b/Sources/vendor/symfony/polyfill-php80/composer.json @@ -0,0 +1,40 @@ +{ + "name": "symfony/polyfill-php80", + "type": "library", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "keywords": ["polyfill", "shim", "compatibility", "portable"], + "homepage": "https://symfony.com", + "license": "MIT", + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "require": { + "php": ">=7.1" + }, + "autoload": { + "psr-4": { "Symfony\\Polyfill\\Php80\\": "" }, + "files": [ "bootstrap.php" ], + "classmap": [ "Resources/stubs" ] + }, + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + } +} diff --git a/Sources/vendor/theseer/tokenizer/.php_cs.dist b/Sources/vendor/theseer/tokenizer/.php_cs.dist deleted file mode 100755 index 8ac26d09..00000000 --- a/Sources/vendor/theseer/tokenizer/.php_cs.dist +++ /dev/null @@ -1,213 +0,0 @@ -registerCustomFixers([ - new \PharIo\CSFixer\PhpdocSingleLineVarFixer() - ]) - ->setRiskyAllowed(true) - ->setRules( - [ - 'PharIo/phpdoc_single_line_var_fixer' => true, - - 'align_multiline_comment' => true, - 'array_indentation' => true, - 'array_syntax' => ['syntax' => 'short'], - 'binary_operator_spaces' => [ - 'operators' => [ - '=' => 'align_single_space_minimal', - '=>' => 'align', - ], - ], - 'blank_line_after_namespace' => true, - 'blank_line_after_opening_tag' => false, - 'blank_line_before_statement' => [ - 'statements' => [ - 'break', - 'continue', - 'declare', - 'do', - 'for', - 'foreach', - 'if', - 'include', - 'include_once', - 'require', - 'require_once', - 'return', - 'switch', - 'throw', - 'try', - 'while', - 'yield', - ], - ], - 'braces' => [ - 'allow_single_line_closure' => false, - 'position_after_anonymous_constructs' => 'same', - 'position_after_control_structures' => 'same', - 'position_after_functions_and_oop_constructs' => 'same' - ], - 'cast_spaces' => ['space' => 'none'], - - // This fixer removes the blank line at class start, no way to disable that, so we disable the fixer :( - //'class_attributes_separation' => ['elements' => ['const', 'method', 'property']], - - 'combine_consecutive_issets' => true, - 'combine_consecutive_unsets' => true, - 'compact_nullable_typehint' => true, - 'concat_space' => ['spacing' => 'one'], - 'date_time_immutable' => true, - 'declare_equal_normalize' => ['space' => 'single'], - 'declare_strict_types' => true, - 'dir_constant' => true, - 'elseif' => true, - 'encoding' => true, - 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, - 'function_declaration' => [ - 'closure_function_spacing' => 'one' - ], - 'header_comment' => false, - 'indentation_type' => true, - 'is_null' => true, - 'line_ending' => true, - 'list_syntax' => ['syntax' => 'short'], - 'logical_operators' => true, - 'lowercase_cast' => true, - 'lowercase_constants' => true, - 'lowercase_keywords' => true, - 'lowercase_static_reference' => true, - 'magic_constant_casing' => true, - 'method_argument_space' => ['ensure_fully_multiline' => true], - 'modernize_types_casting' => true, - 'multiline_comment_opening_closing' => true, - 'multiline_whitespace_before_semicolons' => true, - 'native_constant_invocation' => true, - 'native_function_casing' => true, - 'native_function_invocation' => true, - 'new_with_braces' => false, - 'no_alias_functions' => true, - 'no_alternative_syntax' => true, - 'no_blank_lines_after_class_opening' => false, - 'no_blank_lines_after_phpdoc' => true, - 'no_blank_lines_before_namespace' => true, - 'no_closing_tag' => true, - 'no_empty_comment' => true, - 'no_empty_phpdoc' => true, - 'no_empty_statement' => true, - 'no_extra_blank_lines' => true, - 'no_homoglyph_names' => true, - 'no_leading_import_slash' => true, - 'no_leading_namespace_whitespace' => true, - 'no_mixed_echo_print' => ['use' => 'print'], - 'no_multiline_whitespace_around_double_arrow' => true, - 'no_null_property_initialization' => true, - 'no_php4_constructor' => true, - 'no_short_bool_cast' => true, - 'no_short_echo_tag' => true, - 'no_singleline_whitespace_before_semicolons' => true, - 'no_spaces_after_function_name' => true, - 'no_spaces_inside_parenthesis' => true, - 'no_superfluous_elseif' => true, - 'no_superfluous_phpdoc_tags' => true, - 'no_trailing_comma_in_list_call' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_trailing_whitespace' => true, - 'no_trailing_whitespace_in_comment' => true, - 'no_unneeded_control_parentheses' => false, - 'no_unneeded_curly_braces' => false, - 'no_unneeded_final_method' => true, - 'no_unreachable_default_argument_value' => true, - 'no_unset_on_property' => true, - 'no_unused_imports' => true, - 'no_useless_else' => true, - 'no_useless_return' => true, - 'no_whitespace_before_comma_in_array' => true, - 'no_whitespace_in_blank_line' => true, - 'non_printable_character' => true, - 'normalize_index_brace' => true, - 'object_operator_without_whitespace' => true, - 'ordered_class_elements' => [ - 'order' => [ - 'use_trait', - 'constant_public', - 'constant_protected', - 'constant_private', - 'property_public_static', - 'property_protected_static', - 'property_private_static', - 'property_public', - 'property_protected', - 'property_private', - 'method_public_static', - 'construct', - 'destruct', - 'magic', - 'phpunit', - 'method_public', - 'method_protected', - 'method_private', - 'method_protected_static', - 'method_private_static', - ], - ], - 'ordered_imports' => true, - 'phpdoc_add_missing_param_annotation' => true, - 'phpdoc_align' => true, - 'phpdoc_annotation_without_dot' => true, - 'phpdoc_indent' => true, - 'phpdoc_no_access' => true, - 'phpdoc_no_empty_return' => true, - 'phpdoc_no_package' => true, - 'phpdoc_order' => true, - 'phpdoc_return_self_reference' => true, - 'phpdoc_scalar' => true, - 'phpdoc_separation' => true, - 'phpdoc_single_line_var_spacing' => true, - 'phpdoc_to_comment' => false, - 'phpdoc_trim' => true, - 'phpdoc_trim_consecutive_blank_line_separation' => true, - 'phpdoc_types' => ['groups' => ['simple', 'meta']], - 'phpdoc_types_order' => true, - 'phpdoc_to_return_type' => true, - 'phpdoc_var_without_name' => true, - 'pow_to_exponentiation' => true, - 'protected_to_private' => true, - 'return_assignment' => true, - 'return_type_declaration' => ['space_before' => 'none'], - 'self_accessor' => false, - 'semicolon_after_instruction' => true, - 'set_type_to_cast' => true, - 'short_scalar_cast' => true, - 'simplified_null_return' => true, - 'single_blank_line_at_eof' => true, - 'single_import_per_statement' => true, - 'single_line_after_imports' => true, - 'single_quote' => true, - 'standardize_not_equals' => true, - 'ternary_to_null_coalescing' => true, - 'trailing_comma_in_multiline_array' => false, - 'trim_array_spaces' => true, - 'unary_operator_spaces' => true, - 'visibility_required' => [ - 'elements' => [ - 'const', - 'method', - 'property', - ], - ], - 'void_return' => true, - 'whitespace_after_comma_in_array' => true, - 'yoda_style' => false - ] - ) - ->setFinder( - PhpCsFixer\Finder::create() - ->files() - ->in(__DIR__ . '/src') - ->in(__DIR__ . '/tests') - ->notName('*.phpt') - ->notName('autoload.php') - ); diff --git a/Sources/vendor/theseer/tokenizer/CHANGELOG.md b/Sources/vendor/theseer/tokenizer/CHANGELOG.md old mode 100755 new mode 100644 index 1eff3830..f3e79f4c --- a/Sources/vendor/theseer/tokenizer/CHANGELOG.md +++ b/Sources/vendor/theseer/tokenizer/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to Tokenizer are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [1.2.2] - 2023-11-20 + +### Fixed + +* [#18](https://github.com/theseer/tokenizer/issues/18): Tokenizer fails on protobuf metadata files + ## [1.2.1] - 2021-07-28 diff --git a/Sources/vendor/theseer/tokenizer/LICENSE b/Sources/vendor/theseer/tokenizer/LICENSE old mode 100755 new mode 100644 diff --git a/Sources/vendor/theseer/tokenizer/README.md b/Sources/vendor/theseer/tokenizer/README.md old mode 100755 new mode 100644 index e91ed891..a5f891b4 --- a/Sources/vendor/theseer/tokenizer/README.md +++ b/Sources/vendor/theseer/tokenizer/README.md @@ -3,9 +3,6 @@ A small library for converting tokenized PHP source code into XML. [![Test](https://github.com/theseer/tokenizer/actions/workflows/ci.yml/badge.svg)](https://github.com/theseer/tokenizer/actions/workflows/ci.yml) -[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/theseer/tokenizer/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/theseer/tokenizer/?branch=master) -[![Code Coverage](https://scrutinizer-ci.com/g/theseer/tokenizer/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/theseer/tokenizer/?branch=master) -[![Build Status](https://scrutinizer-ci.com/g/theseer/tokenizer/badges/build.png?b=master)](https://scrutinizer-ci.com/g/theseer/tokenizer/build-status/master) ## Installation diff --git a/Sources/vendor/theseer/tokenizer/composer.json b/Sources/vendor/theseer/tokenizer/composer.json old mode 100755 new mode 100644 diff --git a/Sources/vendor/theseer/tokenizer/composer.lock b/Sources/vendor/theseer/tokenizer/composer.lock old mode 100755 new mode 100644 diff --git a/Sources/vendor/theseer/tokenizer/src/Exception.php b/Sources/vendor/theseer/tokenizer/src/Exception.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/theseer/tokenizer/src/NamespaceUri.php b/Sources/vendor/theseer/tokenizer/src/NamespaceUri.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/theseer/tokenizer/src/NamespaceUriException.php b/Sources/vendor/theseer/tokenizer/src/NamespaceUriException.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/theseer/tokenizer/src/Token.php b/Sources/vendor/theseer/tokenizer/src/Token.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/theseer/tokenizer/src/TokenCollection.php b/Sources/vendor/theseer/tokenizer/src/TokenCollection.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/theseer/tokenizer/src/TokenCollectionException.php b/Sources/vendor/theseer/tokenizer/src/TokenCollectionException.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/theseer/tokenizer/src/Tokenizer.php b/Sources/vendor/theseer/tokenizer/src/Tokenizer.php old mode 100755 new mode 100644 index f582d958..03437bf8 --- a/Sources/vendor/theseer/tokenizer/src/Tokenizer.php +++ b/Sources/vendor/theseer/tokenizer/src/Tokenizer.php @@ -1,6 +1,8 @@ addToken( + new Token( + $line, + \token_name($tok[0]), + '{binary data}' + ) + ); + + continue; + } + foreach ($values as $v) { $token = new Token( $line, @@ -100,13 +114,6 @@ class Tokenizer { $final = new TokenCollection(); foreach ($tokens as $token) { - if ($prev === null) { - $final->addToken($token); - $prev = $token; - - continue; - } - $gap = $token->getLine() - $prev->getLine(); while ($gap > 1) { diff --git a/Sources/vendor/theseer/tokenizer/src/XMLSerializer.php b/Sources/vendor/theseer/tokenizer/src/XMLSerializer.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/CHANGELOG b/Sources/vendor/twig/twig/CHANGELOG old mode 100755 new mode 100644 index 5ee51886..2b8341fd --- a/Sources/vendor/twig/twig/CHANGELOG +++ b/Sources/vendor/twig/twig/CHANGELOG @@ -1,3 +1,13 @@ +# 3.8.0 (2023-11-21) + + * Catch errors thrown during template rendering + * Fix IntlExtension::formatDateTime use of date formatter prototype + * Fix premature loop exit in Security Policy lookup of allowed methods/properties + * Remove NumberFormatter::TYPE_CURRENCY (deprecated in PHP 8.3) + * Restore return type annotations + * Allow Symfony 7 packages to be installed + * Deprecate `twig_test_iterable` function. Use the native `is_iterable` instead. + # 3.7.1 (2023-08-28) * Fix some phpdocs diff --git a/Sources/vendor/twig/twig/LICENSE b/Sources/vendor/twig/twig/LICENSE old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/README.rst b/Sources/vendor/twig/twig/README.rst old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/composer.json b/Sources/vendor/twig/twig/composer.json old mode 100755 new mode 100644 index ad83aeb1..1b1726fe --- a/Sources/vendor/twig/twig/composer.json +++ b/Sources/vendor/twig/twig/composer.json @@ -25,11 +25,12 @@ ], "require": { "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.22", "symfony/polyfill-mbstring": "^1.3", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "symfony/phpunit-bridge": "^5.4.9|^6.3", + "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0", "psr/container": "^1.0|^2.0" }, "autoload": { diff --git a/Sources/vendor/twig/twig/src/Cache/CacheInterface.php b/Sources/vendor/twig/twig/src/Cache/CacheInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Cache/FilesystemCache.php b/Sources/vendor/twig/twig/src/Cache/FilesystemCache.php old mode 100755 new mode 100644 index e075563a..4024adbd --- a/Sources/vendor/twig/twig/src/Cache/FilesystemCache.php +++ b/Sources/vendor/twig/twig/src/Cache/FilesystemCache.php @@ -63,7 +63,7 @@ class FilesystemCache implements CacheInterface if (self::FORCE_BYTECODE_INVALIDATION == ($this->options & self::FORCE_BYTECODE_INVALIDATION)) { // Compile cached file into bytecode cache - if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN)) { + if (\function_exists('opcache_invalidate') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN)) { @opcache_invalidate($key, true); } elseif (\function_exists('apc_compile_file')) { apc_compile_file($key); diff --git a/Sources/vendor/twig/twig/src/Cache/NullCache.php b/Sources/vendor/twig/twig/src/Cache/NullCache.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Compiler.php b/Sources/vendor/twig/twig/src/Compiler.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Environment.php b/Sources/vendor/twig/twig/src/Environment.php old mode 100755 new mode 100644 index a01c366c..d7d51cdb --- a/Sources/vendor/twig/twig/src/Environment.php +++ b/Sources/vendor/twig/twig/src/Environment.php @@ -40,11 +40,11 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - public const VERSION = '3.7.1'; - public const VERSION_ID = 30701; + public const VERSION = '3.8.0'; + public const VERSION_ID = 30800; public const MAJOR_VERSION = 3; - public const MINOR_VERSION = 7; - public const RELEASE_VERSION = 1; + public const MINOR_VERSION = 8; + public const RELEASE_VERSION = 0; public const EXTRA_VERSION = ''; private $charset; @@ -345,7 +345,6 @@ class Environment $this->cache->load($key); } - $source = null; if (!class_exists($cls, false)) { $source = $this->getLoader()->getSourceContext($name); $content = $this->compileSource($source); diff --git a/Sources/vendor/twig/twig/src/Error/Error.php b/Sources/vendor/twig/twig/src/Error/Error.php old mode 100755 new mode 100644 index a68be65f..bca1fa64 --- a/Sources/vendor/twig/twig/src/Error/Error.php +++ b/Sources/vendor/twig/twig/src/Error/Error.php @@ -53,7 +53,7 @@ class Error extends \Exception * @param int $lineno The template line where the error occurred * @param Source|null $source The source context where the error occurred */ - public function __construct(string $message, int $lineno = -1, Source $source = null, \Exception $previous = null) + public function __construct(string $message, int $lineno = -1, Source $source = null, \Throwable $previous = null) { parent::__construct('', 0, $previous); @@ -130,13 +130,13 @@ class Error extends \Exception } $dot = false; - if ('.' === substr($this->message, -1)) { + if (str_ends_with($this->message, '.')) { $this->message = substr($this->message, 0, -1); $dot = true; } $questionMark = false; - if ('?' === substr($this->message, -1)) { + if (str_ends_with($this->message, '?')) { $this->message = substr($this->message, 0, -1); $questionMark = true; } @@ -172,7 +172,7 @@ class Error extends \Exception foreach ($backtrace as $trace) { if (isset($trace['object']) && $trace['object'] instanceof Template) { $currentClass = \get_class($trace['object']); - $isEmbedContainer = null === $templateClass ? false : 0 === strpos($templateClass, $currentClass); + $isEmbedContainer = null === $templateClass ? false : str_starts_with($templateClass, $currentClass); if (null === $this->name || ($this->name == $trace['object']->getTemplateName() && !$isEmbedContainer)) { $template = $trace['object']; $templateClass = \get_class($trace['object']); diff --git a/Sources/vendor/twig/twig/src/Error/LoaderError.php b/Sources/vendor/twig/twig/src/Error/LoaderError.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Error/RuntimeError.php b/Sources/vendor/twig/twig/src/Error/RuntimeError.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Error/SyntaxError.php b/Sources/vendor/twig/twig/src/Error/SyntaxError.php old mode 100755 new mode 100644 index 726b3309..77c437c6 --- a/Sources/vendor/twig/twig/src/Error/SyntaxError.php +++ b/Sources/vendor/twig/twig/src/Error/SyntaxError.php @@ -30,7 +30,7 @@ class SyntaxError extends Error $alternatives = []; foreach ($items as $item) { $lev = levenshtein($name, $item); - if ($lev <= \strlen($name) / 3 || false !== strpos($item, $name)) { + if ($lev <= \strlen($name) / 3 || str_contains($item, $name)) { $alternatives[$item] = $lev; } } diff --git a/Sources/vendor/twig/twig/src/ExpressionParser.php b/Sources/vendor/twig/twig/src/ExpressionParser.php old mode 100755 new mode 100644 index 38347cb3..13e0f087 --- a/Sources/vendor/twig/twig/src/ExpressionParser.php +++ b/Sources/vendor/twig/twig/src/ExpressionParser.php @@ -183,11 +183,14 @@ class ExpressionParser if (!$this->parser->getStream()->nextIf(/* Token::PUNCTUATION_TYPE */ 9, ':')) { $expr2 = $this->parseExpression(); if ($this->parser->getStream()->nextIf(/* Token::PUNCTUATION_TYPE */ 9, ':')) { + // Ternary operator (expr ? expr2 : expr3) $expr3 = $this->parseExpression(); } else { + // Ternary without else (expr ? expr2) $expr3 = new ConstantExpression('', $this->parser->getCurrentToken()->getLine()); } } else { + // Ternary without then (expr ?: expr3) $expr2 = $expr; $expr3 = $this->parseExpression(); } @@ -506,10 +509,6 @@ class ExpressionParser } if ($node instanceof NameExpression && null !== $this->parser->getImportedSymbol('template', $node->getAttribute('name'))) { - if (!$arg instanceof ConstantExpression) { - throw new SyntaxError(sprintf('Dynamic macro names are not supported (called on "%s").', $node->getAttribute('name')), $token->getLine(), $stream->getSourceContext()); - } - $name = $arg->getAttribute('value'); $node = new MethodCallExpression($node, 'macro_'.$name, $arguments, $lineno); diff --git a/Sources/vendor/twig/twig/src/Extension/AbstractExtension.php b/Sources/vendor/twig/twig/src/Extension/AbstractExtension.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Extension/CoreExtension.php b/Sources/vendor/twig/twig/src/Extension/CoreExtension.php old mode 100755 new mode 100644 index 0f1a1021..36aa8f10 --- a/Sources/vendor/twig/twig/src/Extension/CoreExtension.php +++ b/Sources/vendor/twig/twig/src/Extension/CoreExtension.php @@ -251,7 +251,7 @@ final class CoreExtension extends AbstractExtension new TwigTest('divisible by', null, ['node_class' => DivisiblebyTest::class, 'one_mandatory_argument' => true]), new TwigTest('constant', null, ['node_class' => ConstantTest::class]), new TwigTest('empty', 'twig_test_empty'), - new TwigTest('iterable', 'twig_test_iterable'), + new TwigTest('iterable', 'is_iterable'), ]; } @@ -343,9 +343,9 @@ function twig_cycle($values, $position) * @param \Traversable|array|int|float|string $values The values to pick a random item from * @param int|null $max Maximum value used when $values is an int * - * @throws RuntimeError when $values is an empty array (does not apply to an empty string which is returned as is) - * * @return mixed A random value from the given sequence + * + * @throws RuntimeError when $values is an empty array (does not apply to an empty string which is returned as is) */ function twig_random(Environment $env, $values = null, $max = null) { @@ -364,7 +364,6 @@ function twig_random(Environment $env, $values = null, $max = null) } } else { $min = $values; - $max = $max; } return mt_rand((int) $min, (int) $max); @@ -392,7 +391,7 @@ function twig_random(Environment $env, $values = null, $max = null) } } - if (!twig_test_iterable($values)) { + if (!is_iterable($values)) { return $values; } @@ -529,7 +528,7 @@ function twig_date_converter(Environment $env, $date = null, $timezone = null) */ function twig_replace_filter($str, $from) { - if (!twig_test_iterable($from)) { + if (!is_iterable($from)) { throw new RuntimeError(sprintf('The "replace" filter expects an array or "Traversable" as replace values, got "%s".', \is_object($from) ? \get_class($from) : \gettype($from))); } @@ -626,7 +625,7 @@ function twig_array_merge(...$arrays) $result = []; foreach ($arrays as $argNumber => $array) { - if (!twig_test_iterable($array)) { + if (!is_iterable($array)) { throw new RuntimeError(sprintf('The merge filter only works with arrays or "Traversable", got "%s" for argument %d.', \gettype($array), $argNumber + 1)); } @@ -656,7 +655,7 @@ function twig_slice(Environment $env, $item, $start, $length = null, $preserveKe if ($start >= 0 && $length >= 0 && $item instanceof \Iterator) { try { - return iterator_to_array(new \LimitIterator($item, $start, null === $length ? -1 : $length), $preserveKeys); + return iterator_to_array(new \LimitIterator($item, $start, $length ?? -1), $preserveKeys); } catch (\OutOfBoundsException $e) { return []; } @@ -669,7 +668,7 @@ function twig_slice(Environment $env, $item, $start, $length = null, $preserveKe return \array_slice($item, $start, $length, $preserveKeys); } - return (string) mb_substr((string) $item, $start, $length, $env->getCharset()); + return mb_substr((string) $item, $start, $length, $env->getCharset()); } /** @@ -722,7 +721,7 @@ function twig_last(Environment $env, $item) */ function twig_join_filter($value, $glue = '', $and = null) { - if (!twig_test_iterable($value)) { + if (!is_iterable($value)) { $value = (array) $value; } @@ -768,7 +767,7 @@ function twig_split_filter(Environment $env, $value, $delimiter, $limit = null) { $value = $value ?? ''; - if (\strlen($delimiter) > 0) { + if ('' !== $delimiter) { return null === $limit ? explode($delimiter, $value) : explode($delimiter, $value, $limit); } @@ -926,7 +925,7 @@ function twig_in_filter($value, $compare) if (\is_string($compare)) { if (\is_string($value) || \is_int($value) || \is_float($value)) { - return '' === $value || false !== strpos($compare, (string) $value); + return '' === $value || str_contains($compare, (string) $value); } return false; @@ -1022,9 +1021,6 @@ function twig_compare($a, $b) } /** - * @param string $pattern - * @param string|null $subject - * * @return int * * @throws RuntimeError When an invalid pattern is used @@ -1123,7 +1119,7 @@ function twig_length_filter(Environment $env, $thing) return 0; } - if (is_scalar($thing)) { + if (\is_scalar($thing)) { return mb_strlen($thing, $env->getCharset()); } @@ -1233,7 +1229,7 @@ function twig_call_macro(Template $template, string $method, array $args, int $l */ function twig_ensure_traversable($seq) { - if ($seq instanceof \Traversable || \is_array($seq)) { + if (is_iterable($seq)) { return $seq; } @@ -1296,21 +1292,23 @@ function twig_test_empty($value) * @param mixed $value A variable * * @return bool true if the value is traversable + * + * @deprecated since Twig 3.8, to be removed in 4.0 (use the native "is_iterable" function instead) */ function twig_test_iterable($value) { - return $value instanceof \Traversable || \is_array($value); + return is_iterable($value); } /** * Renders a template. * - * @param array $context - * @param string|array $template The template to render or an array of templates to try consecutively - * @param array $variables The variables to pass to the template - * @param bool $withContext - * @param bool $ignoreMissing Whether to ignore missing templates or not - * @param bool $sandboxed Whether to sandbox the template or not + * @param array $context + * @param string|array|TemplateWrapper $template The template to render or an array of templates to try consecutively + * @param array $variables The variables to pass to the template + * @param bool $withContext + * @param bool $ignoreMissing Whether to ignore missing templates or not + * @param bool $sandboxed Whether to sandbox the template or not * * @return string The rendered template */ @@ -1431,7 +1429,7 @@ function twig_constant_is_defined($constant, $object = null) */ function twig_array_batch($items, $size, $fill = null, $preserveKeys = true) { - if (!twig_test_iterable($items)) { + if (!is_iterable($items)) { throw new RuntimeError(sprintf('The "batch" filter expects an array or "Traversable", got "%s".', \is_object($items) ? \get_class($items) : \gettype($items))); } @@ -1573,13 +1571,13 @@ function twig_get_attribute(Environment $env, Source $source, $object, $item, ar $classCache[$method] = $method; $classCache[$lcName = $lcMethods[$i]] = $method; - if ('g' === $lcName[0] && 0 === strpos($lcName, 'get')) { + if ('g' === $lcName[0] && str_starts_with($lcName, 'get')) { $name = substr($method, 3); $lcName = substr($lcName, 3); - } elseif ('i' === $lcName[0] && 0 === strpos($lcName, 'is')) { + } elseif ('i' === $lcName[0] && str_starts_with($lcName, 'is')) { $name = substr($method, 2); $lcName = substr($lcName, 2); - } elseif ('h' === $lcName[0] && 0 === strpos($lcName, 'has')) { + } elseif ('h' === $lcName[0] && str_starts_with($lcName, 'has')) { $name = substr($method, 3); $lcName = substr($lcName, 3); if (\in_array('is'.$lcName, $lcMethods)) { @@ -1675,7 +1673,7 @@ function twig_array_column($array, $name, $index = null): array function twig_array_filter(Environment $env, $array, $arrow) { - if (!twig_test_iterable($array)) { + if (!is_iterable($array)) { throw new RuntimeError(sprintf('The "filter" filter expects an array or "Traversable", got "%s".', \is_object($array) ? \get_class($array) : \gettype($array))); } diff --git a/Sources/vendor/twig/twig/src/Extension/DebugExtension.php b/Sources/vendor/twig/twig/src/Extension/DebugExtension.php old mode 100755 new mode 100644 index bfb23d7b..c0f10d5a --- a/Sources/vendor/twig/twig/src/Extension/DebugExtension.php +++ b/Sources/vendor/twig/twig/src/Extension/DebugExtension.php @@ -19,10 +19,10 @@ final class DebugExtension extends AbstractExtension // dump is safe if var_dump is overridden by xdebug $isDumpOutputHtmlSafe = \extension_loaded('xdebug') // false means that it was not set (and the default is on) or it explicitly enabled - && (false === ini_get('xdebug.overload_var_dump') || ini_get('xdebug.overload_var_dump')) + && (false === \ini_get('xdebug.overload_var_dump') || \ini_get('xdebug.overload_var_dump')) // false means that it was not set (and the default is on) or it explicitly enabled // xdebug.overload_var_dump produces HTML only when html_errors is also enabled - && (false === ini_get('html_errors') || ini_get('html_errors')) + && (false === \ini_get('html_errors') || \ini_get('html_errors')) || 'cli' === \PHP_SAPI ; diff --git a/Sources/vendor/twig/twig/src/Extension/EscaperExtension.php b/Sources/vendor/twig/twig/src/Extension/EscaperExtension.php old mode 100755 new mode 100644 index 9d2251dc..ef8879db --- a/Sources/vendor/twig/twig/src/Extension/EscaperExtension.php +++ b/Sources/vendor/twig/twig/src/Extension/EscaperExtension.php @@ -341,7 +341,7 @@ function twig_escape_filter(Environment $env, $string, $strategy = 'html', $char * The following replaces characters undefined in HTML with the * hex entity for the Unicode replacement character. */ - if (($ord <= 0x1f && "\t" != $chr && "\n" != $chr && "\r" != $chr) || ($ord >= 0x7f && $ord <= 0x9f)) { + if (($ord <= 0x1F && "\t" != $chr && "\n" != $chr && "\r" != $chr) || ($ord >= 0x7F && $ord <= 0x9F)) { return '�'; } @@ -388,7 +388,7 @@ function twig_escape_filter(Environment $env, $string, $strategy = 'html', $char default: $escapers = $env->getExtension(EscaperExtension::class)->getEscapers(); - if (array_key_exists($strategy, $escapers)) { + if (\array_key_exists($strategy, $escapers)) { return $escapers[$strategy]($env, $string, $charset); } diff --git a/Sources/vendor/twig/twig/src/Extension/ExtensionInterface.php b/Sources/vendor/twig/twig/src/Extension/ExtensionInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Extension/GlobalsInterface.php b/Sources/vendor/twig/twig/src/Extension/GlobalsInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Extension/OptimizerExtension.php b/Sources/vendor/twig/twig/src/Extension/OptimizerExtension.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Extension/ProfilerExtension.php b/Sources/vendor/twig/twig/src/Extension/ProfilerExtension.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php b/Sources/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Extension/SandboxExtension.php b/Sources/vendor/twig/twig/src/Extension/SandboxExtension.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Extension/StagingExtension.php b/Sources/vendor/twig/twig/src/Extension/StagingExtension.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Extension/StringLoaderExtension.php b/Sources/vendor/twig/twig/src/Extension/StringLoaderExtension.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/ExtensionSet.php b/Sources/vendor/twig/twig/src/ExtensionSet.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/FileExtensionEscapingStrategy.php b/Sources/vendor/twig/twig/src/FileExtensionEscapingStrategy.php old mode 100755 new mode 100644 index 65198bbb..812071bf --- a/Sources/vendor/twig/twig/src/FileExtensionEscapingStrategy.php +++ b/Sources/vendor/twig/twig/src/FileExtensionEscapingStrategy.php @@ -37,7 +37,7 @@ class FileExtensionEscapingStrategy return 'html'; // return html for directories } - if ('.twig' === substr($name, -5)) { + if (str_ends_with($name, '.twig')) { $name = substr($name, 0, -5); } diff --git a/Sources/vendor/twig/twig/src/Lexer.php b/Sources/vendor/twig/twig/src/Lexer.php old mode 100755 new mode 100644 index 6c45efbc..b23080f5 --- a/Sources/vendor/twig/twig/src/Lexer.php +++ b/Sources/vendor/twig/twig/src/Lexer.php @@ -345,13 +345,13 @@ class Lexer $this->moveCursor($match[0]); } // punctuation - elseif (false !== strpos(self::PUNCTUATION, $this->code[$this->cursor])) { + elseif (str_contains(self::PUNCTUATION, $this->code[$this->cursor])) { // opening bracket - if (false !== strpos('([{', $this->code[$this->cursor])) { + if (str_contains('([{', $this->code[$this->cursor])) { $this->brackets[] = [$this->code[$this->cursor], $this->lineno]; } // closing bracket - elseif (false !== strpos(')]}', $this->code[$this->cursor])) { + elseif (str_contains(')]}', $this->code[$this->cursor])) { if (empty($this->brackets)) { throw new SyntaxError(sprintf('Unexpected "%s".', $this->code[$this->cursor]), $this->lineno, $this->source); } @@ -422,7 +422,7 @@ class Lexer $this->pushToken(/* Token::INTERPOLATION_START_TYPE */ 10); $this->moveCursor($match[0]); $this->pushState(self::STATE_INTERPOLATION); - } elseif (preg_match(self::REGEX_DQ_STRING_PART, $this->code, $match, 0, $this->cursor) && \strlen($match[0]) > 0) { + } elseif (preg_match(self::REGEX_DQ_STRING_PART, $this->code, $match, 0, $this->cursor) && '' !== $match[0]) { $this->pushToken(/* Token::STRING_TYPE */ 7, stripcslashes($match[0])); $this->moveCursor($match[0]); } elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, 0, $this->cursor)) { diff --git a/Sources/vendor/twig/twig/src/Loader/ArrayLoader.php b/Sources/vendor/twig/twig/src/Loader/ArrayLoader.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Loader/ChainLoader.php b/Sources/vendor/twig/twig/src/Loader/ChainLoader.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Loader/FilesystemLoader.php b/Sources/vendor/twig/twig/src/Loader/FilesystemLoader.php old mode 100755 new mode 100644 index 62267a11..1073a406 --- a/Sources/vendor/twig/twig/src/Loader/FilesystemLoader.php +++ b/Sources/vendor/twig/twig/src/Loader/FilesystemLoader.php @@ -36,7 +36,7 @@ class FilesystemLoader implements LoaderInterface */ public function __construct($paths = [], string $rootPath = null) { - $this->rootPath = (null === $rootPath ? getcwd() : $rootPath).\DIRECTORY_SEPARATOR; + $this->rootPath = ($rootPath ?? getcwd()).\DIRECTORY_SEPARATOR; if (null !== $rootPath && false !== ($realPath = realpath($rootPath))) { $this->rootPath = $realPath.\DIRECTORY_SEPARATOR; } @@ -250,7 +250,7 @@ class FilesystemLoader implements LoaderInterface private function validateName(string $name): void { - if (false !== strpos($name, "\0")) { + if (str_contains($name, "\0")) { throw new LoaderError('A template name cannot contain NUL bytes.'); } diff --git a/Sources/vendor/twig/twig/src/Loader/LoaderInterface.php b/Sources/vendor/twig/twig/src/Loader/LoaderInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Markup.php b/Sources/vendor/twig/twig/src/Markup.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/AutoEscapeNode.php b/Sources/vendor/twig/twig/src/Node/AutoEscapeNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/BlockNode.php b/Sources/vendor/twig/twig/src/Node/BlockNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/BlockReferenceNode.php b/Sources/vendor/twig/twig/src/Node/BlockReferenceNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/BodyNode.php b/Sources/vendor/twig/twig/src/Node/BodyNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/CheckSecurityCallNode.php b/Sources/vendor/twig/twig/src/Node/CheckSecurityCallNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/CheckSecurityNode.php b/Sources/vendor/twig/twig/src/Node/CheckSecurityNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/CheckToStringNode.php b/Sources/vendor/twig/twig/src/Node/CheckToStringNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/DeprecatedNode.php b/Sources/vendor/twig/twig/src/Node/DeprecatedNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/DoNode.php b/Sources/vendor/twig/twig/src/Node/DoNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/EmbedNode.php b/Sources/vendor/twig/twig/src/Node/EmbedNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/AbstractExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/AbstractExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/ArrayExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/ArrayExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/ArrowFunctionExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/ArrowFunctionExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/AssignNameExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/AssignNameExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/AbstractBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/AbstractBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/AddBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/AddBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/AndBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/AndBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/BitwiseAndBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/BitwiseAndBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/BitwiseOrBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/BitwiseOrBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/BitwiseXorBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/BitwiseXorBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/ConcatBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/ConcatBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/DivBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/DivBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php old mode 100755 new mode 100644 index c3516b85..73fa20b1 --- a/Sources/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php +++ b/Sources/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php @@ -24,7 +24,7 @@ class EndsWithBinary extends AbstractBinary ->subcompile($this->getNode('left')) ->raw(sprintf(') && is_string($%s = ', $right)) ->subcompile($this->getNode('right')) - ->raw(sprintf(') && (\'\' === $%2$s || $%2$s === substr($%1$s, -strlen($%2$s))))', $left, $right)) + ->raw(sprintf(') && str_ends_with($%1$s, $%2$s))', $left, $right)) ; } diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/EqualBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/EqualBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/FloorDivBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/FloorDivBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/GreaterBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/GreaterBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/GreaterEqualBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/GreaterEqualBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/HasEveryBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/HasEveryBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/HasSomeBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/HasSomeBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/InBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/InBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/LessBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/LessBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/LessEqualBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/LessEqualBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/MatchesBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/MatchesBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/ModBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/ModBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/MulBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/MulBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/NotInBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/NotInBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/OrBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/OrBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/PowerBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/PowerBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/RangeBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/RangeBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/SpaceshipBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/SpaceshipBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php old mode 100755 new mode 100644 index d0df1c4b..22eff92a --- a/Sources/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php +++ b/Sources/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php @@ -24,7 +24,7 @@ class StartsWithBinary extends AbstractBinary ->subcompile($this->getNode('left')) ->raw(sprintf(') && is_string($%s = ', $right)) ->subcompile($this->getNode('right')) - ->raw(sprintf(') && (\'\' === $%2$s || 0 === strpos($%1$s, $%2$s)))', $left, $right)) + ->raw(sprintf(') && str_starts_with($%1$s, $%2$s))', $left, $right)) ; } diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Binary/SubBinary.php b/Sources/vendor/twig/twig/src/Node/Expression/Binary/SubBinary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/BlockReferenceExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/BlockReferenceExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/CallExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/CallExpression.php old mode 100755 new mode 100644 index 11a6b1ab..3a2d7a4f --- a/Sources/vendor/twig/twig/src/Node/Expression/CallExpression.php +++ b/Sources/vendor/twig/twig/src/Node/Expression/CallExpression.php @@ -24,7 +24,7 @@ abstract class CallExpression extends AbstractExpression { $callable = $this->getAttribute('callable'); - if (\is_string($callable) && false === strpos($callable, '::')) { + if (\is_string($callable) && !str_contains($callable, '::')) { $compiler->raw($callable); } else { [$r, $callable] = $this->reflectCallable($callable); @@ -297,13 +297,13 @@ abstract class CallExpression extends AbstractExpression } $r = new \ReflectionFunction($closure); - if (false !== strpos($r->name, '{closure}')) { + if (str_contains($r->name, '{closure}')) { return $this->reflector = [$r, $callable, 'Closure']; } if ($object = $r->getClosureThis()) { $callable = [$object, $r->name]; - $callableName = (\function_exists('get_debug_type') ? get_debug_type($object) : \get_class($object)).'::'.$r->name; + $callableName = get_debug_type($object).'::'.$r->name; } elseif (\PHP_VERSION_ID >= 80111 && $class = $r->getClosureCalledClass()) { $callableName = $class->name.'::'.$r->name; } elseif (\PHP_VERSION_ID < 80111 && $class = $r->getClosureScopeClass()) { diff --git a/Sources/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php old mode 100755 new mode 100644 index 2c7bd0a2..d7db9935 --- a/Sources/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php +++ b/Sources/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php @@ -23,14 +23,23 @@ class ConditionalExpression extends AbstractExpression public function compile(Compiler $compiler): void { - $compiler - ->raw('((') - ->subcompile($this->getNode('expr1')) - ->raw(') ? (') - ->subcompile($this->getNode('expr2')) - ->raw(') : (') - ->subcompile($this->getNode('expr3')) - ->raw('))') - ; + // Ternary with no then uses Elvis operator + if ($this->getNode('expr1') === $this->getNode('expr2')) { + $compiler + ->raw('((') + ->subcompile($this->getNode('expr1')) + ->raw(') ?: (') + ->subcompile($this->getNode('expr3')) + ->raw('))'); + } else { + $compiler + ->raw('((') + ->subcompile($this->getNode('expr1')) + ->raw(') ? (') + ->subcompile($this->getNode('expr2')) + ->raw(') : (') + ->subcompile($this->getNode('expr3')) + ->raw('))'); + } } } diff --git a/Sources/vendor/twig/twig/src/Node/Expression/ConstantExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/ConstantExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Filter/DefaultFilter.php b/Sources/vendor/twig/twig/src/Node/Expression/Filter/DefaultFilter.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/FilterExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/FilterExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/FunctionExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/FunctionExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/InlinePrint.php b/Sources/vendor/twig/twig/src/Node/Expression/InlinePrint.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/MethodCallExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/MethodCallExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/NameExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/NameExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/ParentExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/ParentExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/TempNameExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/TempNameExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Test/ConstantTest.php b/Sources/vendor/twig/twig/src/Node/Expression/Test/ConstantTest.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php b/Sources/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Test/DivisiblebyTest.php b/Sources/vendor/twig/twig/src/Node/Expression/Test/DivisiblebyTest.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Test/EvenTest.php b/Sources/vendor/twig/twig/src/Node/Expression/Test/EvenTest.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Test/NullTest.php b/Sources/vendor/twig/twig/src/Node/Expression/Test/NullTest.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Test/OddTest.php b/Sources/vendor/twig/twig/src/Node/Expression/Test/OddTest.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Test/SameasTest.php b/Sources/vendor/twig/twig/src/Node/Expression/Test/SameasTest.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/TestExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/TestExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Unary/AbstractUnary.php b/Sources/vendor/twig/twig/src/Node/Expression/Unary/AbstractUnary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Unary/NegUnary.php b/Sources/vendor/twig/twig/src/Node/Expression/Unary/NegUnary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Unary/NotUnary.php b/Sources/vendor/twig/twig/src/Node/Expression/Unary/NotUnary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/Unary/PosUnary.php b/Sources/vendor/twig/twig/src/Node/Expression/Unary/PosUnary.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/Expression/VariadicExpression.php b/Sources/vendor/twig/twig/src/Node/Expression/VariadicExpression.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/FlushNode.php b/Sources/vendor/twig/twig/src/Node/FlushNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/ForLoopNode.php b/Sources/vendor/twig/twig/src/Node/ForLoopNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/ForNode.php b/Sources/vendor/twig/twig/src/Node/ForNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/IfNode.php b/Sources/vendor/twig/twig/src/Node/IfNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/ImportNode.php b/Sources/vendor/twig/twig/src/Node/ImportNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/IncludeNode.php b/Sources/vendor/twig/twig/src/Node/IncludeNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/MacroNode.php b/Sources/vendor/twig/twig/src/Node/MacroNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/ModuleNode.php b/Sources/vendor/twig/twig/src/Node/ModuleNode.php old mode 100755 new mode 100644 index e972b6ba..9b485eea --- a/Sources/vendor/twig/twig/src/Node/ModuleNode.php +++ b/Sources/vendor/twig/twig/src/Node/ModuleNode.php @@ -355,6 +355,9 @@ final class ModuleNode extends Node protected function compileGetTemplateName(Compiler $compiler) { $compiler + ->write("/**\n") + ->write(" * @codeCoverageIgnore\n") + ->write(" */\n") ->write("public function getTemplateName()\n", "{\n") ->indent() ->write('return ') @@ -409,6 +412,9 @@ final class ModuleNode extends Node } $compiler + ->write("/**\n") + ->write(" * @codeCoverageIgnore\n") + ->write(" */\n") ->write("public function isTraitable()\n", "{\n") ->indent() ->write(sprintf("return %s;\n", $traitable ? 'true' : 'false')) @@ -420,6 +426,9 @@ final class ModuleNode extends Node protected function compileDebugInfo(Compiler $compiler) { $compiler + ->write("/**\n") + ->write(" * @codeCoverageIgnore\n") + ->write(" */\n") ->write("public function getDebugInfo()\n", "{\n") ->indent() ->write(sprintf("return %s;\n", str_replace("\n", '', var_export(array_reverse($compiler->getDebugInfo(), true), true)))) diff --git a/Sources/vendor/twig/twig/src/Node/Node.php b/Sources/vendor/twig/twig/src/Node/Node.php old mode 100755 new mode 100644 index c0558b9a..30659ae0 --- a/Sources/vendor/twig/twig/src/Node/Node.php +++ b/Sources/vendor/twig/twig/src/Node/Node.php @@ -27,7 +27,6 @@ class Node implements \Countable, \IteratorAggregate protected $lineno; protected $tag; - private $name; private $sourceContext; /** diff --git a/Sources/vendor/twig/twig/src/Node/NodeCaptureInterface.php b/Sources/vendor/twig/twig/src/Node/NodeCaptureInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/NodeOutputInterface.php b/Sources/vendor/twig/twig/src/Node/NodeOutputInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/PrintNode.php b/Sources/vendor/twig/twig/src/Node/PrintNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/SandboxNode.php b/Sources/vendor/twig/twig/src/Node/SandboxNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/SetNode.php b/Sources/vendor/twig/twig/src/Node/SetNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/TextNode.php b/Sources/vendor/twig/twig/src/Node/TextNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Node/WithNode.php b/Sources/vendor/twig/twig/src/Node/WithNode.php old mode 100755 new mode 100644 index 56a33449..2ac9123d --- a/Sources/vendor/twig/twig/src/Node/WithNode.php +++ b/Sources/vendor/twig/twig/src/Node/WithNode.php @@ -45,7 +45,7 @@ class WithNode extends Node ->write(sprintf('$%s = ', $varsName)) ->subcompile($node) ->raw(";\n") - ->write(sprintf("if (!twig_test_iterable(\$%s)) {\n", $varsName)) + ->write(sprintf("if (!is_iterable(\$%s)) {\n", $varsName)) ->indent() ->write("throw new RuntimeError('Variables passed to the \"with\" tag must be a hash.', ") ->repr($node->getTemplateLine()) diff --git a/Sources/vendor/twig/twig/src/NodeTraverser.php b/Sources/vendor/twig/twig/src/NodeTraverser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php b/Sources/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php b/Sources/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php old mode 100755 new mode 100644 index fe56ea30..c390d7cc --- a/Sources/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php +++ b/Sources/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php @@ -57,7 +57,7 @@ final class EscaperNodeVisitor implements NodeVisitorInterface } elseif ($node instanceof AutoEscapeNode) { $this->statusStack[] = $node->getAttribute('value'); } elseif ($node instanceof BlockNode) { - $this->statusStack[] = isset($this->blocks[$node->getAttribute('name')]) ? $this->blocks[$node->getAttribute('name')] : $this->needEscaping($env); + $this->statusStack[] = $this->blocks[$node->getAttribute('name')] ?? $this->needEscaping(); } elseif ($node instanceof ImportNode) { $this->safeVars[] = $node->getNode('var')->getAttribute('name'); } @@ -73,7 +73,7 @@ final class EscaperNodeVisitor implements NodeVisitorInterface $this->blocks = []; } elseif ($node instanceof FilterExpression) { return $this->preEscapeFilterNode($node, $env); - } elseif ($node instanceof PrintNode && false !== $type = $this->needEscaping($env)) { + } elseif ($node instanceof PrintNode && false !== $type = $this->needEscaping()) { $expression = $node->getNode('expr'); if ($expression instanceof ConditionalExpression && $this->shouldUnwrapConditional($expression, $env, $type)) { return new DoNode($this->unwrapConditional($expression, $env, $type), $expression->getTemplateLine()); @@ -85,7 +85,7 @@ final class EscaperNodeVisitor implements NodeVisitorInterface if ($node instanceof AutoEscapeNode || $node instanceof BlockNode) { array_pop($this->statusStack); } elseif ($node instanceof BlockReferenceNode) { - $this->blocks[$node->getAttribute('name')] = $this->needEscaping($env); + $this->blocks[$node->getAttribute('name')] = $this->needEscaping(); } return $node; @@ -183,13 +183,13 @@ final class EscaperNodeVisitor implements NodeVisitorInterface return \in_array($type, $safe) || \in_array('all', $safe); } - private function needEscaping(Environment $env) + private function needEscaping() { if (\count($this->statusStack)) { return $this->statusStack[\count($this->statusStack) - 1]; } - return $this->defaultStrategy ? $this->defaultStrategy : false; + return $this->defaultStrategy ?: false; } private function getEscaperFilter(string $type, Node $node): FilterExpression diff --git a/Sources/vendor/twig/twig/src/NodeVisitor/MacroAutoImportNodeVisitor.php b/Sources/vendor/twig/twig/src/NodeVisitor/MacroAutoImportNodeVisitor.php old mode 100755 new mode 100644 index af477e65..d6a7781b --- a/Sources/vendor/twig/twig/src/NodeVisitor/MacroAutoImportNodeVisitor.php +++ b/Sources/vendor/twig/twig/src/NodeVisitor/MacroAutoImportNodeVisitor.php @@ -50,10 +50,10 @@ final class MacroAutoImportNodeVisitor implements NodeVisitorInterface } } elseif ($this->inAModule) { if ( - $node instanceof GetAttrExpression && - $node->getNode('node') instanceof NameExpression && - '_self' === $node->getNode('node')->getAttribute('name') && - $node->getNode('attribute') instanceof ConstantExpression + $node instanceof GetAttrExpression + && $node->getNode('node') instanceof NameExpression + && '_self' === $node->getNode('node')->getAttribute('name') + && $node->getNode('attribute') instanceof ConstantExpression ) { $this->hasMacroCalls = true; diff --git a/Sources/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php b/Sources/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php b/Sources/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php old mode 100755 new mode 100644 index 7ac75e41..6b39f009 --- a/Sources/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php +++ b/Sources/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php @@ -63,7 +63,7 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface public function enterNode(Node $node, Environment $env): Node { if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) { - $this->enterOptimizeFor($node, $env); + $this->enterOptimizeFor($node); } return $node; @@ -72,14 +72,14 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface public function leaveNode(Node $node, Environment $env): ?Node { if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) { - $this->leaveOptimizeFor($node, $env); + $this->leaveOptimizeFor($node); } if (self::OPTIMIZE_RAW_FILTER === (self::OPTIMIZE_RAW_FILTER & $this->optimizers)) { - $node = $this->optimizeRawFilter($node, $env); + $node = $this->optimizeRawFilter($node); } - $node = $this->optimizePrintNode($node, $env); + $node = $this->optimizePrintNode($node); return $node; } @@ -91,7 +91,7 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface * * * "echo $this->render(Parent)Block()" with "$this->display(Parent)Block()" */ - private function optimizePrintNode(Node $node, Environment $env): Node + private function optimizePrintNode(Node $node): Node { if (!$node instanceof PrintNode) { return $node; @@ -99,8 +99,8 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface $exprNode = $node->getNode('expr'); if ( - $exprNode instanceof BlockReferenceExpression || - $exprNode instanceof ParentExpression + $exprNode instanceof BlockReferenceExpression + || $exprNode instanceof ParentExpression ) { $exprNode->setAttribute('output', true); @@ -113,7 +113,7 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface /** * Removes "raw" filters. */ - private function optimizeRawFilter(Node $node, Environment $env): Node + private function optimizeRawFilter(Node $node): Node { if ($node instanceof FilterExpression && 'raw' == $node->getNode('filter')->getAttribute('value')) { return $node->getNode('node'); @@ -125,7 +125,7 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface /** * Optimizes "for" tag by removing the "loop" variable creation whenever possible. */ - private function enterOptimizeFor(Node $node, Environment $env): void + private function enterOptimizeFor(Node $node): void { if ($node instanceof ForNode) { // disable the loop variable by default @@ -166,7 +166,7 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface && 'include' === $node->getAttribute('name') && (!$node->getNode('arguments')->hasNode('with_context') || false !== $node->getNode('arguments')->getNode('with_context')->getAttribute('value') - ) + ) ) { $this->addLoopToAll(); } @@ -175,12 +175,12 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface elseif ($node instanceof GetAttrExpression && (!$node->getNode('attribute') instanceof ConstantExpression || 'parent' === $node->getNode('attribute')->getAttribute('value') - ) + ) && (true === $this->loops[0]->getAttribute('with_loop') - || ($node->getNode('node') instanceof NameExpression - && 'loop' === $node->getNode('node')->getAttribute('name') - ) - ) + || ($node->getNode('node') instanceof NameExpression + && 'loop' === $node->getNode('node')->getAttribute('name') + ) + ) ) { $this->addLoopToAll(); } @@ -189,7 +189,7 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface /** * Optimizes "for" tag by removing the "loop" variable creation whenever possible. */ - private function leaveOptimizeFor(Node $node, Environment $env): void + private function leaveOptimizeFor(Node $node): void { if ($node instanceof ForNode) { array_shift($this->loops); diff --git a/Sources/vendor/twig/twig/src/NodeVisitor/SafeAnalysisNodeVisitor.php b/Sources/vendor/twig/twig/src/NodeVisitor/SafeAnalysisNodeVisitor.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php b/Sources/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Parser.php b/Sources/vendor/twig/twig/src/Parser.php old mode 100755 new mode 100644 index 4428208f..4016a5f3 --- a/Sources/vendor/twig/twig/src/Parser.php +++ b/Sources/vendor/twig/twig/src/Parser.php @@ -303,10 +303,9 @@ class Parser // check that the body does not contain non-empty output nodes if ( ($node instanceof TextNode && !ctype_space($node->getAttribute('data'))) - || - (!$node instanceof TextNode && !$node instanceof BlockReferenceNode && $node instanceof NodeOutputInterface) + || (!$node instanceof TextNode && !$node instanceof BlockReferenceNode && $node instanceof NodeOutputInterface) ) { - if (false !== strpos((string) $node, \chr(0xEF).\chr(0xBB).\chr(0xBF))) { + if (str_contains((string) $node, \chr(0xEF).\chr(0xBB).\chr(0xBF))) { $t = substr($node->getAttribute('data'), 3); if ('' === $t || ctype_space($t)) { // bypass empty nodes starting with a BOM diff --git a/Sources/vendor/twig/twig/src/Profiler/Dumper/BaseDumper.php b/Sources/vendor/twig/twig/src/Profiler/Dumper/BaseDumper.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Profiler/Dumper/BlackfireDumper.php b/Sources/vendor/twig/twig/src/Profiler/Dumper/BlackfireDumper.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Profiler/Dumper/HtmlDumper.php b/Sources/vendor/twig/twig/src/Profiler/Dumper/HtmlDumper.php old mode 100755 new mode 100644 index 1f2433b4..3c0daf1c --- a/Sources/vendor/twig/twig/src/Profiler/Dumper/HtmlDumper.php +++ b/Sources/vendor/twig/twig/src/Profiler/Dumper/HtmlDumper.php @@ -37,7 +37,7 @@ final class HtmlDumper extends BaseDumper protected function formatNonTemplate(Profile $profile, $prefix): string { - return sprintf('%s└ %s::%s(%s)', $prefix, $profile->getTemplate(), $profile->getType(), isset(self::$colors[$profile->getType()]) ? self::$colors[$profile->getType()] : 'auto', $profile->getName()); + return sprintf('%s└ %s::%s(%s)', $prefix, $profile->getTemplate(), $profile->getType(), self::$colors[$profile->getType()] ?? 'auto', $profile->getName()); } protected function formatTime(Profile $profile, $percent): string diff --git a/Sources/vendor/twig/twig/src/Profiler/Dumper/TextDumper.php b/Sources/vendor/twig/twig/src/Profiler/Dumper/TextDumper.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Profiler/Node/EnterProfileNode.php b/Sources/vendor/twig/twig/src/Profiler/Node/EnterProfileNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Profiler/Node/LeaveProfileNode.php b/Sources/vendor/twig/twig/src/Profiler/Node/LeaveProfileNode.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php b/Sources/vendor/twig/twig/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Profiler/Profile.php b/Sources/vendor/twig/twig/src/Profiler/Profile.php old mode 100755 new mode 100644 index 252ca9b0..7979a23c --- a/Sources/vendor/twig/twig/src/Profiler/Profile.php +++ b/Sources/vendor/twig/twig/src/Profiler/Profile.php @@ -32,7 +32,7 @@ final class Profile implements \IteratorAggregate, \Serializable { $this->template = $template; $this->type = $type; - $this->name = 0 === strpos($name, '__internal_') ? 'INTERNAL' : $name; + $this->name = str_starts_with($name, '__internal_') ? 'INTERNAL' : $name; $this->enter(); } diff --git a/Sources/vendor/twig/twig/src/RuntimeLoader/ContainerRuntimeLoader.php b/Sources/vendor/twig/twig/src/RuntimeLoader/ContainerRuntimeLoader.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/RuntimeLoader/FactoryRuntimeLoader.php b/Sources/vendor/twig/twig/src/RuntimeLoader/FactoryRuntimeLoader.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/RuntimeLoader/RuntimeLoaderInterface.php b/Sources/vendor/twig/twig/src/RuntimeLoader/RuntimeLoaderInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Sandbox/SecurityError.php b/Sources/vendor/twig/twig/src/Sandbox/SecurityError.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFilterError.php b/Sources/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFilterError.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFunctionError.php b/Sources/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFunctionError.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Sandbox/SecurityNotAllowedMethodError.php b/Sources/vendor/twig/twig/src/Sandbox/SecurityNotAllowedMethodError.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Sandbox/SecurityNotAllowedPropertyError.php b/Sources/vendor/twig/twig/src/Sandbox/SecurityNotAllowedPropertyError.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Sandbox/SecurityNotAllowedTagError.php b/Sources/vendor/twig/twig/src/Sandbox/SecurityNotAllowedTagError.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Sandbox/SecurityPolicy.php b/Sources/vendor/twig/twig/src/Sandbox/SecurityPolicy.php old mode 100755 new mode 100644 index 2fc0d013..a725aa4f --- a/Sources/vendor/twig/twig/src/Sandbox/SecurityPolicy.php +++ b/Sources/vendor/twig/twig/src/Sandbox/SecurityPolicy.php @@ -94,9 +94,8 @@ final class SecurityPolicy implements SecurityPolicyInterface $allowed = false; $method = strtr($method, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'); foreach ($this->allowedMethods as $class => $methods) { - if ($obj instanceof $class) { - $allowed = \in_array($method, $methods); - + if ($obj instanceof $class && \in_array($method, $methods)) { + $allowed = true; break; } } @@ -111,9 +110,8 @@ final class SecurityPolicy implements SecurityPolicyInterface { $allowed = false; foreach ($this->allowedProperties as $class => $properties) { - if ($obj instanceof $class) { - $allowed = \in_array($property, \is_array($properties) ? $properties : [$properties]); - + if ($obj instanceof $class && \in_array($property, \is_array($properties) ? $properties : [$properties])) { + $allowed = true; break; } } diff --git a/Sources/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php b/Sources/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Source.php b/Sources/vendor/twig/twig/src/Source.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Template.php b/Sources/vendor/twig/twig/src/Template.php old mode 100755 new mode 100644 index e04bd04a..ffbaae1e --- a/Sources/vendor/twig/twig/src/Template.php +++ b/Sources/vendor/twig/twig/src/Template.php @@ -181,7 +181,7 @@ abstract class Template } throw $e; - } catch (\Exception $e) { + } catch (\Throwable $e) { $e = new RuntimeError(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getSourceContext(), $e); $e->guess(); @@ -404,7 +404,7 @@ abstract class Template } throw $e; - } catch (\Exception $e) { + } catch (\Throwable $e) { $e = new RuntimeError(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getSourceContext(), $e); $e->guess(); diff --git a/Sources/vendor/twig/twig/src/TemplateWrapper.php b/Sources/vendor/twig/twig/src/TemplateWrapper.php old mode 100755 new mode 100644 index c9c6b07c..1ecd8225 --- a/Sources/vendor/twig/twig/src/TemplateWrapper.php +++ b/Sources/vendor/twig/twig/src/TemplateWrapper.php @@ -35,9 +35,7 @@ final class TemplateWrapper public function render(array $context = []): string { - // using func_get_args() allows to not expose the blocks argument - // as it should only be used by internal code - return $this->template->render($context, \func_get_args()[1] ?? []); + return $this->template->render($context); } public function display(array $context = []) diff --git a/Sources/vendor/twig/twig/src/Test/IntegrationTestCase.php b/Sources/vendor/twig/twig/src/Test/IntegrationTestCase.php old mode 100755 new mode 100644 index 307302bb..e97ad417 --- a/Sources/vendor/twig/twig/src/Test/IntegrationTestCase.php +++ b/Sources/vendor/twig/twig/src/Test/IntegrationTestCase.php @@ -84,6 +84,7 @@ abstract class IntegrationTestCase extends TestCase /** * @dataProvider getLegacyTests + * * @group legacy */ public function testLegacyIntegration($file, $message, $condition, $templates, $exception, $outputs, $deprecation = '') @@ -101,7 +102,7 @@ abstract class IntegrationTestCase extends TestCase continue; } - if ($legacyTests xor false !== strpos($file->getRealpath(), '.legacy.test')) { + if ($legacyTests xor str_contains($file->getRealpath(), '.legacy.test')) { continue; } @@ -257,7 +258,7 @@ abstract class IntegrationTestCase extends TestCase $templates = []; preg_match_all('/--TEMPLATE(?:\((.*?)\))?--(.*?)(?=\-\-TEMPLATE|$)/s', $test, $matches, \PREG_SET_ORDER); foreach ($matches as $match) { - $templates[($match[1] ?: 'index.twig')] = $match[2]; + $templates[$match[1] ?: 'index.twig'] = $match[2]; } return $templates; diff --git a/Sources/vendor/twig/twig/src/Test/NodeTestCase.php b/Sources/vendor/twig/twig/src/Test/NodeTestCase.php old mode 100755 new mode 100644 index 3b8b2c86..8b1bef77 --- a/Sources/vendor/twig/twig/src/Test/NodeTestCase.php +++ b/Sources/vendor/twig/twig/src/Test/NodeTestCase.php @@ -43,7 +43,7 @@ abstract class NodeTestCase extends TestCase protected function getCompiler(Environment $environment = null) { - return new Compiler(null === $environment ? $this->getEnvironment() : $environment); + return new Compiler($environment ?? $this->getEnvironment()); } protected function getEnvironment() diff --git a/Sources/vendor/twig/twig/src/Token.php b/Sources/vendor/twig/twig/src/Token.php old mode 100755 new mode 100644 index fd1a89d2..59279b8f --- a/Sources/vendor/twig/twig/src/Token.php +++ b/Sources/vendor/twig/twig/src/Token.php @@ -68,9 +68,9 @@ final class Token } return ($this->type === $type) && ( - null === $values || - (\is_array($values) && \in_array($this->value, $values)) || - $this->value == $values + null === $values + || (\is_array($values) && \in_array($this->value, $values)) + || $this->value == $values ); } diff --git a/Sources/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/ApplyTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/ApplyTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/AutoEscapeTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/AutoEscapeTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/BlockTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/BlockTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/DeprecatedTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/DeprecatedTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/DoTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/DoTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/EmbedTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/EmbedTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/FlushTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/FlushTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/ForTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/ForTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/FromTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/FromTokenParser.php old mode 100755 new mode 100644 index 35098c26..31b6cde4 --- a/Sources/vendor/twig/twig/src/TokenParser/FromTokenParser.php +++ b/Sources/vendor/twig/twig/src/TokenParser/FromTokenParser.php @@ -32,7 +32,7 @@ final class FromTokenParser extends AbstractTokenParser $stream->expect(/* Token::NAME_TYPE */ 5, 'import'); $targets = []; - do { + while (true) { $name = $stream->expect(/* Token::NAME_TYPE */ 5)->getValue(); $alias = $name; @@ -45,7 +45,7 @@ final class FromTokenParser extends AbstractTokenParser if (!$stream->nextIf(/* Token::PUNCTUATION_TYPE */ 9, ',')) { break; } - } while (true); + } $stream->expect(/* Token::BLOCK_END_TYPE */ 3); diff --git a/Sources/vendor/twig/twig/src/TokenParser/IfTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/IfTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/ImportTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/ImportTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/IncludeTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/IncludeTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/MacroTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/MacroTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/SandboxTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/SandboxTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/SetTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/SetTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/TokenParserInterface.php b/Sources/vendor/twig/twig/src/TokenParser/TokenParserInterface.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenParser/UseTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/UseTokenParser.php old mode 100755 new mode 100644 index d0a2de41..3cdbb98a --- a/Sources/vendor/twig/twig/src/TokenParser/UseTokenParser.php +++ b/Sources/vendor/twig/twig/src/TokenParser/UseTokenParser.php @@ -43,7 +43,7 @@ final class UseTokenParser extends AbstractTokenParser $targets = []; if ($stream->nextIf('with')) { - do { + while (true) { $name = $stream->expect(/* Token::NAME_TYPE */ 5)->getValue(); $alias = $name; @@ -56,7 +56,7 @@ final class UseTokenParser extends AbstractTokenParser if (!$stream->nextIf(/* Token::PUNCTUATION_TYPE */ 9, ',')) { break; } - } while (true); + } } $stream->expect(/* Token::BLOCK_END_TYPE */ 3); diff --git a/Sources/vendor/twig/twig/src/TokenParser/WithTokenParser.php b/Sources/vendor/twig/twig/src/TokenParser/WithTokenParser.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TokenStream.php b/Sources/vendor/twig/twig/src/TokenStream.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TwigFilter.php b/Sources/vendor/twig/twig/src/TwigFilter.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TwigFunction.php b/Sources/vendor/twig/twig/src/TwigFunction.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/TwigTest.php b/Sources/vendor/twig/twig/src/TwigTest.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Util/DeprecationCollector.php b/Sources/vendor/twig/twig/src/Util/DeprecationCollector.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/twig/twig/src/Util/TemplateDirIterator.php b/Sources/vendor/twig/twig/src/Util/TemplateDirIterator.php old mode 100755 new mode 100644 diff --git a/Sources/vendor/vlucas/phpdotenv/LICENSE b/Sources/vendor/vlucas/phpdotenv/LICENSE new file mode 100644 index 00000000..922c5522 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/LICENSE @@ -0,0 +1,30 @@ +BSD 3-Clause License + +Copyright (c) 2014, Graham Campbell. +Copyright (c) 2013, Vance Lucas. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Sources/vendor/vlucas/phpdotenv/composer.json b/Sources/vendor/vlucas/phpdotenv/composer.json new file mode 100644 index 00000000..fb972d75 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/composer.json @@ -0,0 +1,60 @@ +{ + "name": "vlucas/phpdotenv", + "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", + "keywords": ["env", "dotenv", "environment"], + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Vance Lucas", + "email": "vance@vancelucas.com", + "homepage": "https://github.com/vlucas" + } + ], + "require": { + "php": "^7.2.5 || ^8.0", + "ext-pcre": "*", + "graham-campbell/result-type": "^1.1.2", + "phpoption/phpoption": "^1.9.2", + "symfony/polyfill-ctype": "^1.24", + "symfony/polyfill-mbstring": "^1.24", + "symfony/polyfill-php80": "^1.24" + }, + "require-dev": { + "ext-filter": "*", + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit":"^8.5.34 || ^9.6.13 || ^10.4.2" + }, + "autoload": { + "psr-4": { + "Dotenv\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Dotenv\\Tests\\": "tests/Dotenv/" + } + }, + "suggest": { + "ext-filter": "Required to use the boolean validator." + }, + "config": { + "allow-plugins": { + "bamarni/composer-bin-plugin": true + }, + "preferred-install": "dist" + }, + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, + "branch-alias": { + "dev-master": "5.6-dev" + } + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Dotenv.php b/Sources/vendor/vlucas/phpdotenv/src/Dotenv.php new file mode 100644 index 00000000..0460ced2 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Dotenv.php @@ -0,0 +1,267 @@ +store = $store; + $this->parser = $parser; + $this->loader = $loader; + $this->repository = $repository; + } + + /** + * Create a new dotenv instance. + * + * @param \Dotenv\Repository\RepositoryInterface $repository + * @param string|string[] $paths + * @param string|string[]|null $names + * @param bool $shortCircuit + * @param string|null $fileEncoding + * + * @return \Dotenv\Dotenv + */ + public static function create(RepositoryInterface $repository, $paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + { + $builder = $names === null ? StoreBuilder::createWithDefaultName() : StoreBuilder::createWithNoNames(); + + foreach ((array) $paths as $path) { + $builder = $builder->addPath($path); + } + + foreach ((array) $names as $name) { + $builder = $builder->addName($name); + } + + if ($shortCircuit) { + $builder = $builder->shortCircuit(); + } + + return new self($builder->fileEncoding($fileEncoding)->make(), new Parser(), new Loader(), $repository); + } + + /** + * Create a new mutable dotenv instance with default repository. + * + * @param string|string[] $paths + * @param string|string[]|null $names + * @param bool $shortCircuit + * @param string|null $fileEncoding + * + * @return \Dotenv\Dotenv + */ + public static function createMutable($paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + { + $repository = RepositoryBuilder::createWithDefaultAdapters()->make(); + + return self::create($repository, $paths, $names, $shortCircuit, $fileEncoding); + } + + /** + * Create a new mutable dotenv instance with default repository with the putenv adapter. + * + * @param string|string[] $paths + * @param string|string[]|null $names + * @param bool $shortCircuit + * @param string|null $fileEncoding + * + * @return \Dotenv\Dotenv + */ + public static function createUnsafeMutable($paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + { + $repository = RepositoryBuilder::createWithDefaultAdapters() + ->addAdapter(PutenvAdapter::class) + ->make(); + + return self::create($repository, $paths, $names, $shortCircuit, $fileEncoding); + } + + /** + * Create a new immutable dotenv instance with default repository. + * + * @param string|string[] $paths + * @param string|string[]|null $names + * @param bool $shortCircuit + * @param string|null $fileEncoding + * + * @return \Dotenv\Dotenv + */ + public static function createImmutable($paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + { + $repository = RepositoryBuilder::createWithDefaultAdapters()->immutable()->make(); + + return self::create($repository, $paths, $names, $shortCircuit, $fileEncoding); + } + + /** + * Create a new immutable dotenv instance with default repository with the putenv adapter. + * + * @param string|string[] $paths + * @param string|string[]|null $names + * @param bool $shortCircuit + * @param string|null $fileEncoding + * + * @return \Dotenv\Dotenv + */ + public static function createUnsafeImmutable($paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + { + $repository = RepositoryBuilder::createWithDefaultAdapters() + ->addAdapter(PutenvAdapter::class) + ->immutable() + ->make(); + + return self::create($repository, $paths, $names, $shortCircuit, $fileEncoding); + } + + /** + * Create a new dotenv instance with an array backed repository. + * + * @param string|string[] $paths + * @param string|string[]|null $names + * @param bool $shortCircuit + * @param string|null $fileEncoding + * + * @return \Dotenv\Dotenv + */ + public static function createArrayBacked($paths, $names = null, bool $shortCircuit = true, string $fileEncoding = null) + { + $repository = RepositoryBuilder::createWithNoAdapters()->addAdapter(ArrayAdapter::class)->make(); + + return self::create($repository, $paths, $names, $shortCircuit, $fileEncoding); + } + + /** + * Parse the given content and resolve nested variables. + * + * This method behaves just like load(), only without mutating your actual + * environment. We do this by using an array backed repository. + * + * @param string $content + * + * @throws \Dotenv\Exception\InvalidFileException + * + * @return array + */ + public static function parse(string $content) + { + $repository = RepositoryBuilder::createWithNoAdapters()->addAdapter(ArrayAdapter::class)->make(); + + $phpdotenv = new self(new StringStore($content), new Parser(), new Loader(), $repository); + + return $phpdotenv->load(); + } + + /** + * Read and load environment file(s). + * + * @throws \Dotenv\Exception\InvalidPathException|\Dotenv\Exception\InvalidEncodingException|\Dotenv\Exception\InvalidFileException + * + * @return array + */ + public function load() + { + $entries = $this->parser->parse($this->store->read()); + + return $this->loader->load($this->repository, $entries); + } + + /** + * Read and load environment file(s), silently failing if no files can be read. + * + * @throws \Dotenv\Exception\InvalidEncodingException|\Dotenv\Exception\InvalidFileException + * + * @return array + */ + public function safeLoad() + { + try { + return $this->load(); + } catch (InvalidPathException $e) { + // suppressing exception + return []; + } + } + + /** + * Required ensures that the specified variables exist, and returns a new validator object. + * + * @param string|string[] $variables + * + * @return \Dotenv\Validator + */ + public function required($variables) + { + return (new Validator($this->repository, (array) $variables))->required(); + } + + /** + * Returns a new validator object that won't check if the specified variables exist. + * + * @param string|string[] $variables + * + * @return \Dotenv\Validator + */ + public function ifPresent($variables) + { + return new Validator($this->repository, (array) $variables); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Exception/ExceptionInterface.php b/Sources/vendor/vlucas/phpdotenv/src/Exception/ExceptionInterface.php new file mode 100644 index 00000000..1e80f531 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Exception/ExceptionInterface.php @@ -0,0 +1,12 @@ + + */ + public function load(RepositoryInterface $repository, array $entries) + { + return \array_reduce($entries, static function (array $vars, Entry $entry) use ($repository) { + $name = $entry->getName(); + + $value = $entry->getValue()->map(static function (Value $value) use ($repository) { + return Resolver::resolve($repository, $value); + }); + + if ($value->isDefined()) { + $inner = $value->get(); + if ($repository->set($name, $inner)) { + return \array_merge($vars, [$name => $inner]); + } + } else { + if ($repository->clear($name)) { + return \array_merge($vars, [$name => null]); + } + } + + return $vars; + }, []); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Loader/LoaderInterface.php b/Sources/vendor/vlucas/phpdotenv/src/Loader/LoaderInterface.php new file mode 100644 index 00000000..275d98e8 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Loader/LoaderInterface.php @@ -0,0 +1,20 @@ + + */ + public function load(RepositoryInterface $repository, array $entries); +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Loader/Resolver.php b/Sources/vendor/vlucas/phpdotenv/src/Loader/Resolver.php new file mode 100644 index 00000000..36d7a4b9 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Loader/Resolver.php @@ -0,0 +1,65 @@ +getVars(), static function (string $s, int $i) use ($repository) { + return Str::substr($s, 0, $i).self::resolveVariable($repository, Str::substr($s, $i)); + }, $value->getChars()); + } + + /** + * Resolve a single nested variable. + * + * @param \Dotenv\Repository\RepositoryInterface $repository + * @param string $str + * + * @return string + */ + private static function resolveVariable(RepositoryInterface $repository, string $str) + { + return Regex::replaceCallback( + '/\A\${([a-zA-Z0-9_.]+)}/', + static function (array $matches) use ($repository) { + return Option::fromValue($repository->get($matches[1])) + ->getOrElse($matches[0]); + }, + $str, + 1 + )->success()->getOrElse($str); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Parser/Entry.php b/Sources/vendor/vlucas/phpdotenv/src/Parser/Entry.php new file mode 100644 index 00000000..7570f587 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Parser/Entry.php @@ -0,0 +1,59 @@ +name = $name; + $this->value = $value; + } + + /** + * Get the entry name. + * + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * Get the entry value. + * + * @return \PhpOption\Option<\Dotenv\Parser\Value> + */ + public function getValue() + { + /** @var \PhpOption\Option<\Dotenv\Parser\Value> */ + return Option::fromValue($this->value); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Parser/EntryParser.php b/Sources/vendor/vlucas/phpdotenv/src/Parser/EntryParser.php new file mode 100644 index 00000000..e286840a --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Parser/EntryParser.php @@ -0,0 +1,300 @@ + + */ + public static function parse(string $entry) + { + return self::splitStringIntoParts($entry)->flatMap(static function (array $parts) { + [$name, $value] = $parts; + + return self::parseName($name)->flatMap(static function (string $name) use ($value) { + /** @var Result */ + $parsedValue = $value === null ? Success::create(null) : self::parseValue($value); + + return $parsedValue->map(static function (?Value $value) use ($name) { + return new Entry($name, $value); + }); + }); + }); + } + + /** + * Split the compound string into parts. + * + * @param string $line + * + * @return \GrahamCampbell\ResultType\Result + */ + private static function splitStringIntoParts(string $line) + { + /** @var array{string,string|null} */ + $result = Str::pos($line, '=')->map(static function () use ($line) { + return \array_map('trim', \explode('=', $line, 2)); + })->getOrElse([$line, null]); + + if ($result[0] === '') { + /** @var \GrahamCampbell\ResultType\Result */ + return Error::create(self::getErrorMessage('an unexpected equals', $line)); + } + + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create($result); + } + + /** + * Parse the given variable name. + * + * That is, strip the optional quotes and leading "export" from the + * variable name. We wrap the answer in a result type. + * + * @param string $name + * + * @return \GrahamCampbell\ResultType\Result + */ + private static function parseName(string $name) + { + if (Str::len($name) > 8 && Str::substr($name, 0, 6) === 'export' && \ctype_space(Str::substr($name, 6, 1))) { + $name = \ltrim(Str::substr($name, 6)); + } + + if (self::isQuotedName($name)) { + $name = Str::substr($name, 1, -1); + } + + if (!self::isValidName($name)) { + /** @var \GrahamCampbell\ResultType\Result */ + return Error::create(self::getErrorMessage('an invalid name', $name)); + } + + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create($name); + } + + /** + * Is the given variable name quoted? + * + * @param string $name + * + * @return bool + */ + private static function isQuotedName(string $name) + { + if (Str::len($name) < 3) { + return false; + } + + $first = Str::substr($name, 0, 1); + $last = Str::substr($name, -1, 1); + + return ($first === '"' && $last === '"') || ($first === '\'' && $last === '\''); + } + + /** + * Is the given variable name valid? + * + * @param string $name + * + * @return bool + */ + private static function isValidName(string $name) + { + return Regex::matches('~(*UTF8)\A[\p{Ll}\p{Lu}\p{M}\p{N}_.]+\z~', $name)->success()->getOrElse(false); + } + + /** + * Parse the given variable value. + * + * This has the effect of stripping quotes and comments, dealing with + * special characters, and locating nested variables, but not resolving + * them. Formally, we run a finite state automaton with an output tape: a + * transducer. We wrap the answer in a result type. + * + * @param string $value + * + * @return \GrahamCampbell\ResultType\Result<\Dotenv\Parser\Value,string> + */ + private static function parseValue(string $value) + { + if (\trim($value) === '') { + /** @var \GrahamCampbell\ResultType\Result<\Dotenv\Parser\Value,string> */ + return Success::create(Value::blank()); + } + + return \array_reduce(\iterator_to_array(Lexer::lex($value)), static function (Result $data, string $token) { + return $data->flatMap(static function (array $data) use ($token) { + return self::processToken($data[1], $token)->map(static function (array $val) use ($data) { + return [$data[0]->append($val[0], $val[1]), $val[2]]; + }); + }); + }, Success::create([Value::blank(), self::INITIAL_STATE]))->flatMap(static function (array $result) { + /** @psalm-suppress DocblockTypeContradiction */ + if (in_array($result[1], self::REJECT_STATES, true)) { + /** @var \GrahamCampbell\ResultType\Result<\Dotenv\Parser\Value,string> */ + return Error::create('a missing closing quote'); + } + + /** @var \GrahamCampbell\ResultType\Result<\Dotenv\Parser\Value,string> */ + return Success::create($result[0]); + })->mapError(static function (string $err) use ($value) { + return self::getErrorMessage($err, $value); + }); + } + + /** + * Process the given token. + * + * @param int $state + * @param string $token + * + * @return \GrahamCampbell\ResultType\Result + */ + private static function processToken(int $state, string $token) + { + switch ($state) { + case self::INITIAL_STATE: + if ($token === '\'') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::SINGLE_QUOTED_STATE]); + } elseif ($token === '"') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::DOUBLE_QUOTED_STATE]); + } elseif ($token === '#') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::COMMENT_STATE]); + } elseif ($token === '$') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create([$token, true, self::UNQUOTED_STATE]); + } else { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create([$token, false, self::UNQUOTED_STATE]); + } + case self::UNQUOTED_STATE: + if ($token === '#') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::COMMENT_STATE]); + } elseif (\ctype_space($token)) { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::WHITESPACE_STATE]); + } elseif ($token === '$') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create([$token, true, self::UNQUOTED_STATE]); + } else { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create([$token, false, self::UNQUOTED_STATE]); + } + case self::SINGLE_QUOTED_STATE: + if ($token === '\'') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::WHITESPACE_STATE]); + } else { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create([$token, false, self::SINGLE_QUOTED_STATE]); + } + case self::DOUBLE_QUOTED_STATE: + if ($token === '"') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::WHITESPACE_STATE]); + } elseif ($token === '\\') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::ESCAPE_SEQUENCE_STATE]); + } elseif ($token === '$') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create([$token, true, self::DOUBLE_QUOTED_STATE]); + } else { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create([$token, false, self::DOUBLE_QUOTED_STATE]); + } + case self::ESCAPE_SEQUENCE_STATE: + if ($token === '"' || $token === '\\') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create([$token, false, self::DOUBLE_QUOTED_STATE]); + } elseif ($token === '$') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create([$token, false, self::DOUBLE_QUOTED_STATE]); + } else { + $first = Str::substr($token, 0, 1); + if (\in_array($first, ['f', 'n', 'r', 't', 'v'], true)) { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create([\stripcslashes('\\'.$first).Str::substr($token, 1), false, self::DOUBLE_QUOTED_STATE]); + } else { + /** @var \GrahamCampbell\ResultType\Result */ + return Error::create('an unexpected escape sequence'); + } + } + case self::WHITESPACE_STATE: + if ($token === '#') { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::COMMENT_STATE]); + } elseif (!\ctype_space($token)) { + /** @var \GrahamCampbell\ResultType\Result */ + return Error::create('unexpected whitespace'); + } else { + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::WHITESPACE_STATE]); + } + case self::COMMENT_STATE: + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create(['', false, self::COMMENT_STATE]); + default: + throw new \Error('Parser entered invalid state.'); + } + } + + /** + * Generate a friendly error message. + * + * @param string $cause + * @param string $subject + * + * @return string + */ + private static function getErrorMessage(string $cause, string $subject) + { + return \sprintf( + 'Encountered %s at [%s].', + $cause, + \strtok($subject, "\n") + ); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Parser/Lexer.php b/Sources/vendor/vlucas/phpdotenv/src/Parser/Lexer.php new file mode 100644 index 00000000..981af24f --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Parser/Lexer.php @@ -0,0 +1,58 @@ + + */ + public static function lex(string $content) + { + static $regex; + + if ($regex === null) { + $regex = '(('.\implode(')|(', self::PATTERNS).'))A'; + } + + $offset = 0; + + while (isset($content[$offset])) { + if (!\preg_match($regex, $content, $matches, 0, $offset)) { + throw new \Error(\sprintf('Lexer encountered unexpected character [%s].', $content[$offset])); + } + + $offset += \strlen($matches[0]); + + yield $matches[0]; + } + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Parser/Lines.php b/Sources/vendor/vlucas/phpdotenv/src/Parser/Lines.php new file mode 100644 index 00000000..64979932 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Parser/Lines.php @@ -0,0 +1,127 @@ +map(static function () use ($line) { + return self::looksLikeMultilineStop($line, true) === false; + })->getOrElse(false); + } + + /** + * Determine if the given line can be the start of a multiline variable. + * + * @param string $line + * @param bool $started + * + * @return bool + */ + private static function looksLikeMultilineStop(string $line, bool $started) + { + if ($line === '"') { + return true; + } + + return Regex::occurrences('/(?=([^\\\\]"))/', \str_replace('\\\\', '', $line))->map(static function (int $count) use ($started) { + return $started ? $count > 1 : $count >= 1; + })->success()->getOrElse(false); + } + + /** + * Determine if the line in the file is a comment or whitespace. + * + * @param string $line + * + * @return bool + */ + private static function isCommentOrWhitespace(string $line) + { + $line = \trim($line); + + return $line === '' || (isset($line[0]) && $line[0] === '#'); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Parser/Parser.php b/Sources/vendor/vlucas/phpdotenv/src/Parser/Parser.php new file mode 100644 index 00000000..2d30dfd6 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Parser/Parser.php @@ -0,0 +1,53 @@ +mapError(static function () { + return 'Could not split into separate lines.'; + })->flatMap(static function (array $lines) { + return self::process(Lines::process($lines)); + })->mapError(static function (string $error) { + throw new InvalidFileException(\sprintf('Failed to parse dotenv file. %s', $error)); + })->success()->get(); + } + + /** + * Convert the raw entries into proper entries. + * + * @param string[] $entries + * + * @return \GrahamCampbell\ResultType\Result<\Dotenv\Parser\Entry[],string> + */ + private static function process(array $entries) + { + /** @var \GrahamCampbell\ResultType\Result<\Dotenv\Parser\Entry[],string> */ + return \array_reduce($entries, static function (Result $result, string $raw) { + return $result->flatMap(static function (array $entries) use ($raw) { + return EntryParser::parse($raw)->map(static function (Entry $entry) use ($entries) { + /** @var \Dotenv\Parser\Entry[] */ + return \array_merge($entries, [$entry]); + }); + }); + }, Success::create([])); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Parser/ParserInterface.php b/Sources/vendor/vlucas/phpdotenv/src/Parser/ParserInterface.php new file mode 100644 index 00000000..17cc42ad --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Parser/ParserInterface.php @@ -0,0 +1,19 @@ +chars = $chars; + $this->vars = $vars; + } + + /** + * Create an empty value instance. + * + * @return \Dotenv\Parser\Value + */ + public static function blank() + { + return new self('', []); + } + + /** + * Create a new value instance, appending the characters. + * + * @param string $chars + * @param bool $var + * + * @return \Dotenv\Parser\Value + */ + public function append(string $chars, bool $var) + { + return new self( + $this->chars.$chars, + $var ? \array_merge($this->vars, [Str::len($this->chars)]) : $this->vars + ); + } + + /** + * Get the string representation of the parsed value. + * + * @return string + */ + public function getChars() + { + return $this->chars; + } + + /** + * Get the locations of the variables in the value. + * + * @return int[] + */ + public function getVars() + { + $vars = $this->vars; + + \rsort($vars); + + return $vars; + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/AdapterInterface.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/AdapterInterface.php new file mode 100644 index 00000000..5604398a --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/AdapterInterface.php @@ -0,0 +1,15 @@ + + */ + public static function create(); +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ApacheAdapter.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ApacheAdapter.php new file mode 100644 index 00000000..af0aae11 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ApacheAdapter.php @@ -0,0 +1,89 @@ + + */ + public static function create() + { + if (self::isSupported()) { + /** @var \PhpOption\Option */ + return Some::create(new self()); + } + + return None::create(); + } + + /** + * Determines if the adapter is supported. + * + * This happens if PHP is running as an Apache module. + * + * @return bool + */ + private static function isSupported() + { + return \function_exists('apache_getenv') && \function_exists('apache_setenv'); + } + + /** + * Read an environment variable, if it exists. + * + * @param non-empty-string $name + * + * @return \PhpOption\Option + */ + public function read(string $name) + { + /** @var \PhpOption\Option */ + return Option::fromValue(apache_getenv($name))->filter(static function ($value) { + return \is_string($value) && $value !== ''; + }); + } + + /** + * Write to an environment variable, if possible. + * + * @param non-empty-string $name + * @param string $value + * + * @return bool + */ + public function write(string $name, string $value) + { + return apache_setenv($name, $value); + } + + /** + * Delete an environment variable, if possible. + * + * @param non-empty-string $name + * + * @return bool + */ + public function delete(string $name) + { + return apache_setenv($name, ''); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ArrayAdapter.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ArrayAdapter.php new file mode 100644 index 00000000..df64cf6d --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ArrayAdapter.php @@ -0,0 +1,80 @@ + + */ + private $variables; + + /** + * Create a new array adapter instance. + * + * @return void + */ + private function __construct() + { + $this->variables = []; + } + + /** + * Create a new instance of the adapter, if it is available. + * + * @return \PhpOption\Option<\Dotenv\Repository\Adapter\AdapterInterface> + */ + public static function create() + { + /** @var \PhpOption\Option */ + return Some::create(new self()); + } + + /** + * Read an environment variable, if it exists. + * + * @param non-empty-string $name + * + * @return \PhpOption\Option + */ + public function read(string $name) + { + return Option::fromArraysValue($this->variables, $name); + } + + /** + * Write to an environment variable, if possible. + * + * @param non-empty-string $name + * @param string $value + * + * @return bool + */ + public function write(string $name, string $value) + { + $this->variables[$name] = $value; + + return true; + } + + /** + * Delete an environment variable, if possible. + * + * @param non-empty-string $name + * + * @return bool + */ + public function delete(string $name) + { + unset($this->variables[$name]); + + return true; + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/EnvConstAdapter.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/EnvConstAdapter.php new file mode 100644 index 00000000..9eb19477 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/EnvConstAdapter.php @@ -0,0 +1,89 @@ + + */ + public static function create() + { + /** @var \PhpOption\Option */ + return Some::create(new self()); + } + + /** + * Read an environment variable, if it exists. + * + * @param non-empty-string $name + * + * @return \PhpOption\Option + */ + public function read(string $name) + { + /** @var \PhpOption\Option */ + return Option::fromArraysValue($_ENV, $name) + ->filter(static function ($value) { + return \is_scalar($value); + }) + ->map(static function ($value) { + if ($value === false) { + return 'false'; + } + + if ($value === true) { + return 'true'; + } + + /** @psalm-suppress PossiblyInvalidCast */ + return (string) $value; + }); + } + + /** + * Write to an environment variable, if possible. + * + * @param non-empty-string $name + * @param string $value + * + * @return bool + */ + public function write(string $name, string $value) + { + $_ENV[$name] = $value; + + return true; + } + + /** + * Delete an environment variable, if possible. + * + * @param non-empty-string $name + * + * @return bool + */ + public function delete(string $name) + { + unset($_ENV[$name]); + + return true; + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/GuardedWriter.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/GuardedWriter.php new file mode 100644 index 00000000..fed8b9ba --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/GuardedWriter.php @@ -0,0 +1,85 @@ +writer = $writer; + $this->allowList = $allowList; + } + + /** + * Write to an environment variable, if possible. + * + * @param non-empty-string $name + * @param string $value + * + * @return bool + */ + public function write(string $name, string $value) + { + // Don't set non-allowed variables + if (!$this->isAllowed($name)) { + return false; + } + + // Set the value on the inner writer + return $this->writer->write($name, $value); + } + + /** + * Delete an environment variable, if possible. + * + * @param non-empty-string $name + * + * @return bool + */ + public function delete(string $name) + { + // Don't clear non-allowed variables + if (!$this->isAllowed($name)) { + return false; + } + + // Set the value on the inner writer + return $this->writer->delete($name); + } + + /** + * Determine if the given variable is allowed. + * + * @param non-empty-string $name + * + * @return bool + */ + private function isAllowed(string $name) + { + return \in_array($name, $this->allowList, true); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ImmutableWriter.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ImmutableWriter.php new file mode 100644 index 00000000..399e6f9b --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ImmutableWriter.php @@ -0,0 +1,110 @@ + + */ + private $loaded; + + /** + * Create a new immutable writer instance. + * + * @param \Dotenv\Repository\Adapter\WriterInterface $writer + * @param \Dotenv\Repository\Adapter\ReaderInterface $reader + * + * @return void + */ + public function __construct(WriterInterface $writer, ReaderInterface $reader) + { + $this->writer = $writer; + $this->reader = $reader; + $this->loaded = []; + } + + /** + * Write to an environment variable, if possible. + * + * @param non-empty-string $name + * @param string $value + * + * @return bool + */ + public function write(string $name, string $value) + { + // Don't overwrite existing environment variables + // Ruby's dotenv does this with `ENV[key] ||= value` + if ($this->isExternallyDefined($name)) { + return false; + } + + // Set the value on the inner writer + if (!$this->writer->write($name, $value)) { + return false; + } + + // Record that we have loaded the variable + $this->loaded[$name] = ''; + + return true; + } + + /** + * Delete an environment variable, if possible. + * + * @param non-empty-string $name + * + * @return bool + */ + public function delete(string $name) + { + // Don't clear existing environment variables + if ($this->isExternallyDefined($name)) { + return false; + } + + // Clear the value on the inner writer + if (!$this->writer->delete($name)) { + return false; + } + + // Leave the variable as fair game + unset($this->loaded[$name]); + + return true; + } + + /** + * Determine if the given variable is externally defined. + * + * That is, is it an "existing" variable. + * + * @param non-empty-string $name + * + * @return bool + */ + private function isExternallyDefined(string $name) + { + return $this->reader->read($name)->isDefined() && !isset($this->loaded[$name]); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/MultiReader.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/MultiReader.php new file mode 100644 index 00000000..0cfda6f6 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/MultiReader.php @@ -0,0 +1,48 @@ +readers = $readers; + } + + /** + * Read an environment variable, if it exists. + * + * @param non-empty-string $name + * + * @return \PhpOption\Option + */ + public function read(string $name) + { + foreach ($this->readers as $reader) { + $result = $reader->read($name); + if ($result->isDefined()) { + return $result; + } + } + + return None::create(); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/MultiWriter.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/MultiWriter.php new file mode 100644 index 00000000..15a9d8fd --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/MultiWriter.php @@ -0,0 +1,64 @@ +writers = $writers; + } + + /** + * Write to an environment variable, if possible. + * + * @param non-empty-string $name + * @param string $value + * + * @return bool + */ + public function write(string $name, string $value) + { + foreach ($this->writers as $writers) { + if (!$writers->write($name, $value)) { + return false; + } + } + + return true; + } + + /** + * Delete an environment variable, if possible. + * + * @param non-empty-string $name + * + * @return bool + */ + public function delete(string $name) + { + foreach ($this->writers as $writers) { + if (!$writers->delete($name)) { + return false; + } + } + + return true; + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/PutenvAdapter.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/PutenvAdapter.php new file mode 100644 index 00000000..6d017cdb --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/PutenvAdapter.php @@ -0,0 +1,91 @@ + + */ + public static function create() + { + if (self::isSupported()) { + /** @var \PhpOption\Option */ + return Some::create(new self()); + } + + return None::create(); + } + + /** + * Determines if the adapter is supported. + * + * @return bool + */ + private static function isSupported() + { + return \function_exists('getenv') && \function_exists('putenv'); + } + + /** + * Read an environment variable, if it exists. + * + * @param non-empty-string $name + * + * @return \PhpOption\Option + */ + public function read(string $name) + { + /** @var \PhpOption\Option */ + return Option::fromValue(\getenv($name), false)->filter(static function ($value) { + return \is_string($value); + }); + } + + /** + * Write to an environment variable, if possible. + * + * @param non-empty-string $name + * @param string $value + * + * @return bool + */ + public function write(string $name, string $value) + { + \putenv("$name=$value"); + + return true; + } + + /** + * Delete an environment variable, if possible. + * + * @param non-empty-string $name + * + * @return bool + */ + public function delete(string $name) + { + \putenv($name); + + return true; + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ReaderInterface.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ReaderInterface.php new file mode 100644 index 00000000..306a63fc --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ReaderInterface.php @@ -0,0 +1,17 @@ + + */ + public function read(string $name); +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ReplacingWriter.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ReplacingWriter.php new file mode 100644 index 00000000..98c0f041 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ReplacingWriter.php @@ -0,0 +1,104 @@ + + */ + private $seen; + + /** + * Create a new replacement writer instance. + * + * @param \Dotenv\Repository\Adapter\WriterInterface $writer + * @param \Dotenv\Repository\Adapter\ReaderInterface $reader + * + * @return void + */ + public function __construct(WriterInterface $writer, ReaderInterface $reader) + { + $this->writer = $writer; + $this->reader = $reader; + $this->seen = []; + } + + /** + * Write to an environment variable, if possible. + * + * @param non-empty-string $name + * @param string $value + * + * @return bool + */ + public function write(string $name, string $value) + { + if ($this->exists($name)) { + return $this->writer->write($name, $value); + } + + // succeed if nothing to do + return true; + } + + /** + * Delete an environment variable, if possible. + * + * @param non-empty-string $name + * + * @return bool + */ + public function delete(string $name) + { + if ($this->exists($name)) { + return $this->writer->delete($name); + } + + // succeed if nothing to do + return true; + } + + /** + * Does the given environment variable exist. + * + * Returns true if it currently exists, or existed at any point in the past + * that we are aware of. + * + * @param non-empty-string $name + * + * @return bool + */ + private function exists(string $name) + { + if (isset($this->seen[$name])) { + return true; + } + + if ($this->reader->read($name)->isDefined()) { + $this->seen[$name] = ''; + + return true; + } + + return false; + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ServerConstAdapter.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ServerConstAdapter.php new file mode 100644 index 00000000..f93b6e5e --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/ServerConstAdapter.php @@ -0,0 +1,89 @@ + + */ + public static function create() + { + /** @var \PhpOption\Option */ + return Some::create(new self()); + } + + /** + * Read an environment variable, if it exists. + * + * @param non-empty-string $name + * + * @return \PhpOption\Option + */ + public function read(string $name) + { + /** @var \PhpOption\Option */ + return Option::fromArraysValue($_SERVER, $name) + ->filter(static function ($value) { + return \is_scalar($value); + }) + ->map(static function ($value) { + if ($value === false) { + return 'false'; + } + + if ($value === true) { + return 'true'; + } + + /** @psalm-suppress PossiblyInvalidCast */ + return (string) $value; + }); + } + + /** + * Write to an environment variable, if possible. + * + * @param non-empty-string $name + * @param string $value + * + * @return bool + */ + public function write(string $name, string $value) + { + $_SERVER[$name] = $value; + + return true; + } + + /** + * Delete an environment variable, if possible. + * + * @param non-empty-string $name + * + * @return bool + */ + public function delete(string $name) + { + unset($_SERVER[$name]); + + return true; + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/WriterInterface.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/WriterInterface.php new file mode 100644 index 00000000..4cb3d61f --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/Adapter/WriterInterface.php @@ -0,0 +1,27 @@ +reader = $reader; + $this->writer = $writer; + } + + /** + * Determine if the given environment variable is defined. + * + * @param string $name + * + * @return bool + */ + public function has(string $name) + { + return '' !== $name && $this->reader->read($name)->isDefined(); + } + + /** + * Get an environment variable. + * + * @param string $name + * + * @throws \InvalidArgumentException + * + * @return string|null + */ + public function get(string $name) + { + if ('' === $name) { + throw new InvalidArgumentException('Expected name to be a non-empty string.'); + } + + return $this->reader->read($name)->getOrElse(null); + } + + /** + * Set an environment variable. + * + * @param string $name + * @param string $value + * + * @throws \InvalidArgumentException + * + * @return bool + */ + public function set(string $name, string $value) + { + if ('' === $name) { + throw new InvalidArgumentException('Expected name to be a non-empty string.'); + } + + return $this->writer->write($name, $value); + } + + /** + * Clear an environment variable. + * + * @param string $name + * + * @throws \InvalidArgumentException + * + * @return bool + */ + public function clear(string $name) + { + if ('' === $name) { + throw new InvalidArgumentException('Expected name to be a non-empty string.'); + } + + return $this->writer->delete($name); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/RepositoryBuilder.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/RepositoryBuilder.php new file mode 100644 index 00000000..a042f9a1 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/RepositoryBuilder.php @@ -0,0 +1,272 @@ +readers = $readers; + $this->writers = $writers; + $this->immutable = $immutable; + $this->allowList = $allowList; + } + + /** + * Create a new repository builder instance with no adapters added. + * + * @return \Dotenv\Repository\RepositoryBuilder + */ + public static function createWithNoAdapters() + { + return new self(); + } + + /** + * Create a new repository builder instance with the default adapters added. + * + * @return \Dotenv\Repository\RepositoryBuilder + */ + public static function createWithDefaultAdapters() + { + $adapters = \iterator_to_array(self::defaultAdapters()); + + return new self($adapters, $adapters); + } + + /** + * Return the array of default adapters. + * + * @return \Generator<\Dotenv\Repository\Adapter\AdapterInterface> + */ + private static function defaultAdapters() + { + foreach (self::DEFAULT_ADAPTERS as $adapter) { + $instance = $adapter::create(); + if ($instance->isDefined()) { + yield $instance->get(); + } + } + } + + /** + * Determine if the given name if of an adapterclass. + * + * @param string $name + * + * @return bool + */ + private static function isAnAdapterClass(string $name) + { + if (!\class_exists($name)) { + return false; + } + + return (new ReflectionClass($name))->implementsInterface(AdapterInterface::class); + } + + /** + * Creates a repository builder with the given reader added. + * + * Accepts either a reader instance, or a class-string for an adapter. If + * the adapter is not supported, then we silently skip adding it. + * + * @param \Dotenv\Repository\Adapter\ReaderInterface|string $reader + * + * @throws \InvalidArgumentException + * + * @return \Dotenv\Repository\RepositoryBuilder + */ + public function addReader($reader) + { + if (!(\is_string($reader) && self::isAnAdapterClass($reader)) && !($reader instanceof ReaderInterface)) { + throw new InvalidArgumentException( + \sprintf( + 'Expected either an instance of %s or a class-string implementing %s', + ReaderInterface::class, + AdapterInterface::class + ) + ); + } + + $optional = Some::create($reader)->flatMap(static function ($reader) { + return \is_string($reader) ? $reader::create() : Some::create($reader); + }); + + $readers = \array_merge($this->readers, \iterator_to_array($optional)); + + return new self($readers, $this->writers, $this->immutable, $this->allowList); + } + + /** + * Creates a repository builder with the given writer added. + * + * Accepts either a writer instance, or a class-string for an adapter. If + * the adapter is not supported, then we silently skip adding it. + * + * @param \Dotenv\Repository\Adapter\WriterInterface|string $writer + * + * @throws \InvalidArgumentException + * + * @return \Dotenv\Repository\RepositoryBuilder + */ + public function addWriter($writer) + { + if (!(\is_string($writer) && self::isAnAdapterClass($writer)) && !($writer instanceof WriterInterface)) { + throw new InvalidArgumentException( + \sprintf( + 'Expected either an instance of %s or a class-string implementing %s', + WriterInterface::class, + AdapterInterface::class + ) + ); + } + + $optional = Some::create($writer)->flatMap(static function ($writer) { + return \is_string($writer) ? $writer::create() : Some::create($writer); + }); + + $writers = \array_merge($this->writers, \iterator_to_array($optional)); + + return new self($this->readers, $writers, $this->immutable, $this->allowList); + } + + /** + * Creates a repository builder with the given adapter added. + * + * Accepts either an adapter instance, or a class-string for an adapter. If + * the adapter is not supported, then we silently skip adding it. We will + * add the adapter as both a reader and a writer. + * + * @param \Dotenv\Repository\Adapter\WriterInterface|string $adapter + * + * @throws \InvalidArgumentException + * + * @return \Dotenv\Repository\RepositoryBuilder + */ + public function addAdapter($adapter) + { + if (!(\is_string($adapter) && self::isAnAdapterClass($adapter)) && !($adapter instanceof AdapterInterface)) { + throw new InvalidArgumentException( + \sprintf( + 'Expected either an instance of %s or a class-string implementing %s', + WriterInterface::class, + AdapterInterface::class + ) + ); + } + + $optional = Some::create($adapter)->flatMap(static function ($adapter) { + return \is_string($adapter) ? $adapter::create() : Some::create($adapter); + }); + + $readers = \array_merge($this->readers, \iterator_to_array($optional)); + $writers = \array_merge($this->writers, \iterator_to_array($optional)); + + return new self($readers, $writers, $this->immutable, $this->allowList); + } + + /** + * Creates a repository builder with mutability enabled. + * + * @return \Dotenv\Repository\RepositoryBuilder + */ + public function immutable() + { + return new self($this->readers, $this->writers, true, $this->allowList); + } + + /** + * Creates a repository builder with the given allow list. + * + * @param string[]|null $allowList + * + * @return \Dotenv\Repository\RepositoryBuilder + */ + public function allowList(array $allowList = null) + { + return new self($this->readers, $this->writers, $this->immutable, $allowList); + } + + /** + * Creates a new repository instance. + * + * @return \Dotenv\Repository\RepositoryInterface + */ + public function make() + { + $reader = new MultiReader($this->readers); + $writer = new MultiWriter($this->writers); + + if ($this->immutable) { + $writer = new ImmutableWriter($writer, $reader); + } + + if ($this->allowList !== null) { + $writer = new GuardedWriter($writer, $this->allowList); + } + + return new AdapterRepository($reader, $writer); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Repository/RepositoryInterface.php b/Sources/vendor/vlucas/phpdotenv/src/Repository/RepositoryInterface.php new file mode 100644 index 00000000..d9b18a40 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Repository/RepositoryInterface.php @@ -0,0 +1,51 @@ + + */ + public static function read(array $filePaths, bool $shortCircuit = true, string $fileEncoding = null) + { + $output = []; + + foreach ($filePaths as $filePath) { + $content = self::readFromFile($filePath, $fileEncoding); + if ($content->isDefined()) { + $output[$filePath] = $content->get(); + if ($shortCircuit) { + break; + } + } + } + + return $output; + } + + /** + * Read the given file. + * + * @param string $path + * @param string|null $encoding + * + * @throws \Dotenv\Exception\InvalidEncodingException + * + * @return \PhpOption\Option + */ + private static function readFromFile(string $path, string $encoding = null) + { + /** @var Option */ + $content = Option::fromValue(@\file_get_contents($path), false); + + return $content->flatMap(static function (string $content) use ($encoding) { + return Str::utf8($content, $encoding)->mapError(static function (string $error) { + throw new InvalidEncodingException($error); + })->success(); + }); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Store/FileStore.php b/Sources/vendor/vlucas/phpdotenv/src/Store/FileStore.php new file mode 100644 index 00000000..43f6135c --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Store/FileStore.php @@ -0,0 +1,72 @@ +filePaths = $filePaths; + $this->shortCircuit = $shortCircuit; + $this->fileEncoding = $fileEncoding; + } + + /** + * Read the content of the environment file(s). + * + * @throws \Dotenv\Exception\InvalidEncodingException|\Dotenv\Exception\InvalidPathException + * + * @return string + */ + public function read() + { + if ($this->filePaths === []) { + throw new InvalidPathException('At least one environment file path must be provided.'); + } + + $contents = Reader::read($this->filePaths, $this->shortCircuit, $this->fileEncoding); + + if (\count($contents) > 0) { + return \implode("\n", $contents); + } + + throw new InvalidPathException( + \sprintf('Unable to read any of the environment file(s) at [%s].', \implode(', ', $this->filePaths)) + ); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Store/StoreBuilder.php b/Sources/vendor/vlucas/phpdotenv/src/Store/StoreBuilder.php new file mode 100644 index 00000000..304117fc --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Store/StoreBuilder.php @@ -0,0 +1,141 @@ +paths = $paths; + $this->names = $names; + $this->shortCircuit = $shortCircuit; + $this->fileEncoding = $fileEncoding; + } + + /** + * Create a new store builder instance with no names. + * + * @return \Dotenv\Store\StoreBuilder + */ + public static function createWithNoNames() + { + return new self(); + } + + /** + * Create a new store builder instance with the default name. + * + * @return \Dotenv\Store\StoreBuilder + */ + public static function createWithDefaultName() + { + return new self([], [self::DEFAULT_NAME]); + } + + /** + * Creates a store builder with the given path added. + * + * @param string $path + * + * @return \Dotenv\Store\StoreBuilder + */ + public function addPath(string $path) + { + return new self(\array_merge($this->paths, [$path]), $this->names, $this->shortCircuit, $this->fileEncoding); + } + + /** + * Creates a store builder with the given name added. + * + * @param string $name + * + * @return \Dotenv\Store\StoreBuilder + */ + public function addName(string $name) + { + return new self($this->paths, \array_merge($this->names, [$name]), $this->shortCircuit, $this->fileEncoding); + } + + /** + * Creates a store builder with short circuit mode enabled. + * + * @return \Dotenv\Store\StoreBuilder + */ + public function shortCircuit() + { + return new self($this->paths, $this->names, true, $this->fileEncoding); + } + + /** + * Creates a store builder with the specified file encoding. + * + * @param string|null $fileEncoding + * + * @return \Dotenv\Store\StoreBuilder + */ + public function fileEncoding(string $fileEncoding = null) + { + return new self($this->paths, $this->names, $this->shortCircuit, $fileEncoding); + } + + /** + * Creates a new store instance. + * + * @return \Dotenv\Store\StoreInterface + */ + public function make() + { + return new FileStore( + Paths::filePaths($this->paths, $this->names), + $this->shortCircuit, + $this->fileEncoding + ); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Store/StoreInterface.php b/Sources/vendor/vlucas/phpdotenv/src/Store/StoreInterface.php new file mode 100644 index 00000000..6f5b9862 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Store/StoreInterface.php @@ -0,0 +1,17 @@ +content = $content; + } + + /** + * Read the content of the environment file(s). + * + * @return string + */ + public function read() + { + return $this->content; + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Util/Regex.php b/Sources/vendor/vlucas/phpdotenv/src/Util/Regex.php new file mode 100644 index 00000000..52c15780 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Util/Regex.php @@ -0,0 +1,112 @@ + + */ + public static function matches(string $pattern, string $subject) + { + return self::pregAndWrap(static function (string $subject) use ($pattern) { + return @\preg_match($pattern, $subject) === 1; + }, $subject); + } + + /** + * Perform a preg match all, wrapping up the result. + * + * @param string $pattern + * @param string $subject + * + * @return \GrahamCampbell\ResultType\Result + */ + public static function occurrences(string $pattern, string $subject) + { + return self::pregAndWrap(static function (string $subject) use ($pattern) { + return (int) @\preg_match_all($pattern, $subject); + }, $subject); + } + + /** + * Perform a preg replace callback, wrapping up the result. + * + * @param string $pattern + * @param callable $callback + * @param string $subject + * @param int|null $limit + * + * @return \GrahamCampbell\ResultType\Result + */ + public static function replaceCallback(string $pattern, callable $callback, string $subject, int $limit = null) + { + return self::pregAndWrap(static function (string $subject) use ($pattern, $callback, $limit) { + return (string) @\preg_replace_callback($pattern, $callback, $subject, $limit ?? -1); + }, $subject); + } + + /** + * Perform a preg split, wrapping up the result. + * + * @param string $pattern + * @param string $subject + * + * @return \GrahamCampbell\ResultType\Result + */ + public static function split(string $pattern, string $subject) + { + return self::pregAndWrap(static function (string $subject) use ($pattern) { + /** @var string[] */ + return (array) @\preg_split($pattern, $subject); + }, $subject); + } + + /** + * Perform a preg operation, wrapping up the result. + * + * @template V + * + * @param callable(string):V $operation + * @param string $subject + * + * @return \GrahamCampbell\ResultType\Result + */ + private static function pregAndWrap(callable $operation, string $subject) + { + $result = $operation($subject); + + if (\preg_last_error() !== \PREG_NO_ERROR) { + /** @var \GrahamCampbell\ResultType\Result */ + return Error::create(\preg_last_error_msg()); + } + + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create($result); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Util/Str.php b/Sources/vendor/vlucas/phpdotenv/src/Util/Str.php new file mode 100644 index 00000000..087e236a --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Util/Str.php @@ -0,0 +1,98 @@ + + */ + public static function utf8(string $input, string $encoding = null) + { + if ($encoding !== null && !\in_array($encoding, \mb_list_encodings(), true)) { + /** @var \GrahamCampbell\ResultType\Result */ + return Error::create( + \sprintf('Illegal character encoding [%s] specified.', $encoding) + ); + } + $converted = $encoding === null ? + @\mb_convert_encoding($input, 'UTF-8') : + @\mb_convert_encoding($input, 'UTF-8', $encoding); + /** + * this is for support UTF-8 with BOM encoding + * @see https://en.wikipedia.org/wiki/Byte_order_mark + * @see https://github.com/vlucas/phpdotenv/issues/500 + */ + if (\substr($converted, 0, 3) == "\xEF\xBB\xBF") { + $converted = \substr($converted, 3); + } + /** @var \GrahamCampbell\ResultType\Result */ + return Success::create($converted); + } + + /** + * Search for a given substring of the input. + * + * @param string $haystack + * @param string $needle + * + * @return \PhpOption\Option + */ + public static function pos(string $haystack, string $needle) + { + /** @var \PhpOption\Option */ + return Option::fromValue(\mb_strpos($haystack, $needle, 0, 'UTF-8'), false); + } + + /** + * Grab the specified substring of the input. + * + * @param string $input + * @param int $start + * @param int|null $length + * + * @return string + */ + public static function substr(string $input, int $start, int $length = null) + { + return \mb_substr($input, $start, $length, 'UTF-8'); + } + + /** + * Compute the length of the given string. + * + * @param string $input + * + * @return int + */ + public static function len(string $input) + { + return \mb_strlen($input, 'UTF-8'); + } +} diff --git a/Sources/vendor/vlucas/phpdotenv/src/Validator.php b/Sources/vendor/vlucas/phpdotenv/src/Validator.php new file mode 100644 index 00000000..0c04ab62 --- /dev/null +++ b/Sources/vendor/vlucas/phpdotenv/src/Validator.php @@ -0,0 +1,209 @@ +repository = $repository; + $this->variables = $variables; + } + + /** + * Assert that each variable is present. + * + * @throws \Dotenv\Exception\ValidationException + * + * @return \Dotenv\Validator + */ + public function required() + { + return $this->assert( + static function (?string $value) { + return $value !== null; + }, + 'is missing' + ); + } + + /** + * Assert that each variable is not empty. + * + * @throws \Dotenv\Exception\ValidationException + * + * @return \Dotenv\Validator + */ + public function notEmpty() + { + return $this->assertNullable( + static function (string $value) { + return Str::len(\trim($value)) > 0; + }, + 'is empty' + ); + } + + /** + * Assert that each specified variable is an integer. + * + * @throws \Dotenv\Exception\ValidationException + * + * @return \Dotenv\Validator + */ + public function isInteger() + { + return $this->assertNullable( + static function (string $value) { + return \ctype_digit($value); + }, + 'is not an integer' + ); + } + + /** + * Assert that each specified variable is a boolean. + * + * @throws \Dotenv\Exception\ValidationException + * + * @return \Dotenv\Validator + */ + public function isBoolean() + { + return $this->assertNullable( + static function (string $value) { + if ($value === '') { + return false; + } + + return \filter_var($value, \FILTER_VALIDATE_BOOLEAN, \FILTER_NULL_ON_FAILURE) !== null; + }, + 'is not a boolean' + ); + } + + /** + * Assert that each variable is amongst the given choices. + * + * @param string[] $choices + * + * @throws \Dotenv\Exception\ValidationException + * + * @return \Dotenv\Validator + */ + public function allowedValues(array $choices) + { + return $this->assertNullable( + static function (string $value) use ($choices) { + return \in_array($value, $choices, true); + }, + \sprintf('is not one of [%s]', \implode(', ', $choices)) + ); + } + + /** + * Assert that each variable matches the given regular expression. + * + * @param string $regex + * + * @throws \Dotenv\Exception\ValidationException + * + * @return \Dotenv\Validator + */ + public function allowedRegexValues(string $regex) + { + return $this->assertNullable( + static function (string $value) use ($regex) { + return Regex::matches($regex, $value)->success()->getOrElse(false); + }, + \sprintf('does not match "%s"', $regex) + ); + } + + /** + * Assert that the callback returns true for each variable. + * + * @param callable(?string):bool $callback + * @param string $message + * + * @throws \Dotenv\Exception\ValidationException + * + * @return \Dotenv\Validator + */ + public function assert(callable $callback, string $message) + { + $failing = []; + + foreach ($this->variables as $variable) { + if ($callback($this->repository->get($variable)) === false) { + $failing[] = \sprintf('%s %s', $variable, $message); + } + } + + if (\count($failing) > 0) { + throw new ValidationException(\sprintf( + 'One or more environment variables failed assertions: %s.', + \implode(', ', $failing) + )); + } + + return $this; + } + + /** + * Assert that the callback returns true for each variable. + * + * Skip checking null variable values. + * + * @param callable(string):bool $callback + * @param string $message + * + * @throws \Dotenv\Exception\ValidationException + * + * @return \Dotenv\Validator + */ + public function assertNullable(callable $callback, string $message) + { + return $this->assert( + static function (?string $value) use ($callback) { + if ($value === null) { + return true; + } + + return $callback($value); + }, + $message + ); + } +}