From 82e8cf1a6d4c3676c96ff881d1a62b2aa861adae Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 Oct 2017 16:05:06 -0700 Subject: [PATCH] removed Makefile support (#215) --- README.rst | 15 +------ lexik/jwt-authentication-bundle/2.3/Makefile | 9 ----- symfony/framework-bundle/3.3/Makefile | 40 ------------------- symfony/framework-bundle/3.3/post-install.txt | 5 ++- 4 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 lexik/jwt-authentication-bundle/2.3/Makefile delete mode 100644 symfony/framework-bundle/3.3/Makefile diff --git a/README.rst b/README.rst index b3f672b5..9e790b54 100644 --- a/README.rst +++ b/README.rst @@ -77,7 +77,7 @@ unconfiguring the dependencies. There are eight types of tasks, which are called **configurators**: ``copy-from-recipe``, ``copy-from-package``, ``bundles``, ``env``, -``makefile``, ``composer-scripts``, ``gitignore``, and ``post-install-output``. +``composer-scripts``, ``gitignore``, and ``post-install-output``. ``bundles`` Configurator ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -210,18 +210,6 @@ Don't remove or modify these separators. Use ``%generate(secret)%`` as the value of any environment variable to replace it with a cryptographically secure random value of 16 bytes. -``makefile`` Configurator -~~~~~~~~~~~~~~~~~~~~~~~~~ - -Adds new tasks to the ``Makefile`` file stored in the root of the Symfony -project. Unlike other configurators, there is no specific entry in the manifest -file. Define tasks by creating a ``Makefile`` file at the root of the recipe -directory (a ``PHP_EOL`` character is added after each line). - -Similar to the ``env`` configurator, the contents are copied into the ``Makefile`` -file and wrapped with section separators (``###> your-recipe-name-here ###``) -that must not be removed or modified. - ``composer-scripts`` Configurator ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -303,7 +291,6 @@ the recipe: * Aliases are only supported in the main repository, not the contrib one; * Aliases must not be already defined by another package; * The manifest file only contains supported keys; -* The Makefile file does not wrap Symfony Console commands as tasks * The package must exist on Packagist; * The package must have at least one version on Packagist; * The package must have an MIT or BSD license; diff --git a/lexik/jwt-authentication-bundle/2.3/Makefile b/lexik/jwt-authentication-bundle/2.3/Makefile deleted file mode 100644 index 58c1e05e..00000000 --- a/lexik/jwt-authentication-bundle/2.3/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -OPENSSL_BIN := $(shell which openssl) -generate-jwt-keys: ## Generates JWT auth keys -ifndef OPENSSL_BIN - $(error "Unable to generate keys (needs OpenSSL)") -endif - mkdir -p config/jwt - openssl genrsa -passout pass:${JWT_PASSPHRASE} -out ${JWT_PRIVATE_KEY_PATH} -aes256 4096 - openssl rsa -passin pass:${JWT_PASSPHRASE} -pubout -in ${JWT_PRIVATE_KEY_PATH} -out ${JWT_PUBLIC_KEY_PATH} - @echo "\033[32mRSA key pair successfully generated\033[39m" diff --git a/symfony/framework-bundle/3.3/Makefile b/symfony/framework-bundle/3.3/Makefile deleted file mode 100644 index fd894349..00000000 --- a/symfony/framework-bundle/3.3/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -CONSOLE := $(shell which bin/console) -sf_console: -ifndef CONSOLE - @printf "Run \033[32mcomposer require cli\033[39m to install the Symfony console.\n" -endif - -cache-clear: ## Clears the cache -ifdef CONSOLE - @bin/console cache:clear --no-warmup -else - @rm -rf var/cache/* -endif -.PHONY: cache-clear - -cache-warmup: cache-clear ## Warms up an empty cache -ifdef CONSOLE - @bin/console cache:warmup -else - @printf "Cannot warm up the cache (needs symfony/console).\n" -endif -.PHONY: cache-warmup - -serve_as_sf: sf_console -ifndef CONSOLE - @${MAKE} serve_as_php -endif - @bin/console list | grep server:start > /dev/null || ${MAKE} serve_as_php - @bin/console server:start - - @printf "Quit the server with \033[32;49mbin/console server:stop\033[39m\n" - -serve_as_php: - @printf "\033[32;49mServer listening on http://127.0.0.1:8000\033[39m\n" - @printf "Quit the server with CTRL-C.\n" - @printf "Run \033[32mcomposer require symfony/web-server-bundle\033[39m for a better web server.\n" - php -S 127.0.0.1:8000 -t public - -serve: ## Runs a local web server - @${MAKE} serve_as_sf -.PHONY: sf_console serve serve_as_sf serve_as_php diff --git a/symfony/framework-bundle/3.3/post-install.txt b/symfony/framework-bundle/3.3/post-install.txt index f46cdb29..c545b6f1 100644 --- a/symfony/framework-bundle/3.3/post-install.txt +++ b/symfony/framework-bundle/3.3/post-install.txt @@ -4,7 +4,10 @@ * Run your application: 1. Change to the project directory - 2. Execute the make serve command; + 2. Execute the php -S 127.0.0.1:8000 -t public command; 3. Browse to the http://localhost:8000/ URL. + Quit the server with CTRL-C. + Run composer require symfony/web-server-bundle for a better web server. + * Read the documentation at https://symfony.com/doc