diff --git a/composer.json b/composer.json index be07dc9..9e9067c 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,7 @@ "php": ">=7.2.5", "ext-ctype": "*", "ext-iconv": "*", + "symfony/apache-pack": "^1.0", "symfony/console": "5.4.*", "symfony/dotenv": "5.4.*", "symfony/flex": "^1.17|^2", @@ -14,8 +15,6 @@ "symfony/runtime": "5.4.*", "symfony/yaml": "5.4.*" }, - "require-dev": { - }, "config": { "allow-plugins": { "composer/package-versions-deprecated": true, @@ -60,7 +59,7 @@ }, "extra": { "symfony": { - "allow-contrib": false, + "allow-contrib": true, "require": "5.4.*" } } diff --git a/composer.lock b/composer.lock index f902822..857052d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e5b48b46cc68536c0f6497e15a39811e", + "content-hash": "32af6839ed7dc1a45c978ad0feeccabd", "packages": [ { "name": "psr/cache", @@ -203,6 +203,32 @@ }, "time": "2021-05-03T11:20:27+00:00" }, + { + "name": "symfony/apache-pack", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/apache-pack.git", + "reference": "3aa5818d73ad2551281fc58a75afd9ca82622e6c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/apache-pack/zipball/3aa5818d73ad2551281fc58a75afd9ca82622e6c", + "reference": "3aa5818d73ad2551281fc58a75afd9ca82622e6c", + "shasum": "" + }, + "type": "symfony-pack", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A pack for Apache support in Symfony", + "support": { + "issues": "https://github.com/symfony/apache-pack/issues", + "source": "https://github.com/symfony/apache-pack/tree/master" + }, + "time": "2017-12-12T01:46:35+00:00" + }, { "name": "symfony/cache", "version": "v5.4.7", diff --git a/public/.htaccess b/public/.htaccess new file mode 100644 index 0000000..2776637 --- /dev/null +++ b/public/.htaccess @@ -0,0 +1,66 @@ +# Use the front controller as index file. It serves as a fallback solution when +# every other rewrite/redirect fails (e.g. in an aliased environment without +# mod_rewrite). Additionally, this reduces the matching process for the +# start page (path "/") because otherwise Apache will apply the rewriting rules +# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl). +DirectoryIndex index.php + +# By default, Apache does not evaluate symbolic links if you did not enable this +# feature in your server configuration. Uncomment the following line if you +# install assets as symlinks or if you experience problems related to symlinks +# when compiling LESS/Sass/CoffeScript assets. +# Options +FollowSymlinks + +# Disabling MultiViews prevents unwanted negotiation, e.g. "/index" should not resolve +# to the front controller "/index.php" but be rewritten to "/index.php/index". + + Options -MultiViews + + + + RewriteEngine On + + # Determine the RewriteBase automatically and set it as environment variable. + # If you are using Apache aliases to do mass virtual hosting or installed the + # project in a subdirectory, the base path will be prepended to allow proper + # resolution of the index.php file and to redirect to the correct URI. It will + # work in environments without path prefix as well, providing a safe, one-size + # fits all solution. But as you do not need it in this case, you can comment + # the following 2 lines to eliminate the overhead. + RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$ + RewriteRule .* - [E=BASE:%1] + + # Sets the HTTP_AUTHORIZATION header removed by Apache + RewriteCond %{HTTP:Authorization} .+ + RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0] + + # Redirect to URI without front controller to prevent duplicate content + # (with and without `/index.php`). Only do this redirect on the initial + # rewrite by Apache and not on subsequent cycles. Otherwise we would get an + # endless redirect loop (request -> rewrite to front controller -> + # redirect -> request -> ...). + # So in case you get a "too many redirects" error or you always get redirected + # to the start page because your Apache does not expose the REDIRECT_STATUS + # environment variable, you have 2 choices: + # - disable this feature by commenting the following 2 lines or + # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the + # following RewriteCond (best solution) + RewriteCond %{ENV:REDIRECT_STATUS} ="" + RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L] + + # If the requested filename exists, simply serve it. + # We only want to let Apache serve files and not directories. + # Rewrite all other queries to the front controller. + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ %{ENV:BASE}/index.php [L] + + + + + # When mod_rewrite is not available, we instruct a temporary redirect of + # the start page to the front controller explicitly so that the website + # and the generated links can still be used. + RedirectMatch 307 ^/$ /index.php/ + # RedirectTemp cannot be used instead + + diff --git a/symfony.lock b/symfony.lock index dd461d0..a80c4e8 100644 --- a/symfony.lock +++ b/symfony.lock @@ -11,6 +11,18 @@ "psr/log": { "version": "2.0.0" }, + "symfony/apache-pack": { + "version": "1.0", + "recipe": { + "repo": "github.com/symfony/recipes-contrib", + "branch": "master", + "version": "1.0", + "ref": "9d254a22efca7264203eea98b866f16f944b2f09" + }, + "files": [ + "public/.htaccess" + ] + }, "symfony/cache": { "version": "v5.4.7" }, diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 07d3293..d40b6c5 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -209,6 +209,35 @@ }, "install-path": "../psr/log" }, + { + "name": "symfony/apache-pack", + "version": "v1.0.1", + "version_normalized": "1.0.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/apache-pack.git", + "reference": "3aa5818d73ad2551281fc58a75afd9ca82622e6c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/apache-pack/zipball/3aa5818d73ad2551281fc58a75afd9ca82622e6c", + "reference": "3aa5818d73ad2551281fc58a75afd9ca82622e6c", + "shasum": "" + }, + "time": "2017-12-12T01:46:35+00:00", + "type": "symfony-pack", + "installation-source": "dist", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A pack for Apache support in Symfony", + "support": { + "issues": "https://github.com/symfony/apache-pack/issues", + "source": "https://github.com/symfony/apache-pack/tree/master" + }, + "install-path": "../symfony/apache-pack" + }, { "name": "symfony/cache", "version": "v5.4.7", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 7a07b93..ad16b65 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'ea47c93aa762fe2431e0de74452ee04f1f06c15d', + 'reference' => '8ac12f715c8b3d186084d274b182c22d754ce09b', 'name' => '__root__', 'dev' => true, ), @@ -16,7 +16,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'ea47c93aa762fe2431e0de74452ee04f1f06c15d', + 'reference' => '8ac12f715c8b3d186084d274b182c22d754ce09b', 'dev_requirement' => false, ), 'psr/cache' => array( @@ -85,6 +85,15 @@ 0 => '1.0|2.0', ), ), + 'symfony/apache-pack' => array( + 'pretty_version' => 'v1.0.1', + 'version' => '1.0.1.0', + 'type' => 'symfony-pack', + 'install_path' => __DIR__ . '/../symfony/apache-pack', + 'aliases' => array(), + 'reference' => '3aa5818d73ad2551281fc58a75afd9ca82622e6c', + 'dev_requirement' => false, + ), 'symfony/cache' => array( 'pretty_version' => 'v5.4.7', 'version' => '5.4.7.0', diff --git a/vendor/symfony/apache-pack/composer.json b/vendor/symfony/apache-pack/composer.json new file mode 100644 index 0000000..5b4125a --- /dev/null +++ b/vendor/symfony/apache-pack/composer.json @@ -0,0 +1,6 @@ +{ + "name": "symfony/apache-pack", + "type": "symfony-pack", + "license": "MIT", + "description": "A pack for Apache support in Symfony" +}