From 62937f87e381ed96bdb2fb241faee20fe93081ed Mon Sep 17 00:00:00 2001 From: Cedric Ziel Date: Sun, 8 Sep 2024 12:02:42 +0200 Subject: [PATCH] Add Procfile to symfony app --- .../fixtures/smoke/symfony-minimal/Procfile | 1 + .../smoke/symfony-minimal/composer.json | 5 +- .../smoke/symfony-minimal/composer.lock | 28 +++++++- .../smoke/symfony-minimal/public/.htaccess | 70 +++++++++++++++++++ .../smoke/symfony-minimal/symfony.lock | 12 ++++ 5 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 buildpacks/php/tests/fixtures/smoke/symfony-minimal/Procfile create mode 100644 buildpacks/php/tests/fixtures/smoke/symfony-minimal/public/.htaccess diff --git a/buildpacks/php/tests/fixtures/smoke/symfony-minimal/Procfile b/buildpacks/php/tests/fixtures/smoke/symfony-minimal/Procfile new file mode 100644 index 0000000..6458f10 --- /dev/null +++ b/buildpacks/php/tests/fixtures/smoke/symfony-minimal/Procfile @@ -0,0 +1 @@ +web: heroku-php-apache2 public/ diff --git a/buildpacks/php/tests/fixtures/smoke/symfony-minimal/composer.json b/buildpacks/php/tests/fixtures/smoke/symfony-minimal/composer.json index 8207207..805b837 100644 --- a/buildpacks/php/tests/fixtures/smoke/symfony-minimal/composer.json +++ b/buildpacks/php/tests/fixtures/smoke/symfony-minimal/composer.json @@ -7,6 +7,7 @@ "php": ">=8.2", "ext-ctype": "*", "ext-iconv": "*", + "symfony/apache-pack": "^1.0", "symfony/console": "7.1.*", "symfony/dotenv": "7.1.*", "symfony/flex": "^2", @@ -14,8 +15,6 @@ "symfony/runtime": "7.1.*", "symfony/yaml": "7.1.*" }, - "require-dev": { - }, "config": { "allow-plugins": { "php-http/discovery": true, @@ -61,7 +60,7 @@ }, "extra": { "symfony": { - "allow-contrib": false, + "allow-contrib": true, "require": "7.1.*" } } diff --git a/buildpacks/php/tests/fixtures/smoke/symfony-minimal/composer.lock b/buildpacks/php/tests/fixtures/smoke/symfony-minimal/composer.lock index ed20c62..4b883b2 100644 --- a/buildpacks/php/tests/fixtures/smoke/symfony-minimal/composer.lock +++ b/buildpacks/php/tests/fixtures/smoke/symfony-minimal/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": "50f9c0973acafa44bb359f58b30b8e58", + "content-hash": "072c5e090f0af301a3af7600163dd595", "packages": [ { "name": "psr/cache", @@ -208,6 +208,32 @@ }, "time": "2024-08-21T13:31:24+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": "v7.1.4", diff --git a/buildpacks/php/tests/fixtures/smoke/symfony-minimal/public/.htaccess b/buildpacks/php/tests/fixtures/smoke/symfony-minimal/public/.htaccess new file mode 100644 index 0000000..f7345df --- /dev/null +++ b/buildpacks/php/tests/fixtures/smoke/symfony-minimal/public/.htaccess @@ -0,0 +1,70 @@ +# 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 +SymLinksIfOwnerMatch + +# 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 + + + + # This Option needs to be enabled for RewriteRule, otherwise it will show an error like + # 'Options FollowSymLinks or SymLinksIfOwnerMatch is off which implies that RewriteRule directive is forbidden' + Options +SymLinksIfOwnerMatch + + 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/buildpacks/php/tests/fixtures/smoke/symfony-minimal/symfony.lock b/buildpacks/php/tests/fixtures/smoke/symfony-minimal/symfony.lock index 5267cab..a42bde2 100644 --- a/buildpacks/php/tests/fixtures/smoke/symfony-minimal/symfony.lock +++ b/buildpacks/php/tests/fixtures/smoke/symfony-minimal/symfony.lock @@ -1,4 +1,16 @@ { + "symfony/apache-pack": { + "version": "1.0", + "recipe": { + "repo": "github.com/symfony/recipes-contrib", + "branch": "main", + "version": "1.0", + "ref": "0f18b4decdf5695d692c1d0dfd65516a07a6adf1" + }, + "files": [ + "public/.htaccess" + ] + }, "symfony/console": { "version": "7.1", "recipe": {