Updated composer dependencies, added fish shell, bash completion.

Author: DKravtsov

.idea/htdocs.iml

@@ -25,6 +25,8 @@ RUN if [ "$BUILD_ARGUMENT_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_ENV
 
 # install all the dependencies and enable PHP modules
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
+      bash-completion \
+      fish \
       procps \
       nano \
       git \
@@ -81,6 +83,9 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 RUN chmod +x /usr/bin/composer
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
+# Enable Composer autocompletion
+RUN composer completion bash > /etc/bash_completion.d/composer
+
 # add supervisor
 RUN mkdir -p /var/log/supervisor
 COPY --chown=root:root ./docker/general/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
@@ -92,6 +97,15 @@ WORKDIR $APP_HOME
 
 USER ${USERNAME}
 
+# Add necessary stuff to bash autocomplete
+RUN echo 'source /usr/share/bash-completion/bash_completion' >> /home/${USERNAME}/.bashrc \
+    && echo 'alias console="/app/bin/console"' >> /home/${USERNAME}/.bashrc
+
+# copy fish configs
+COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/completions/ /home/${USERNAME}/.config/fish/completions/
+COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/functions/ /home/${USERNAME}/.config/fish/functions/
+COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/config.fish /home/${USERNAME}/.config/fish/config.fish
+
 # copy source files
 COPY --chown=${USERNAME}:${USERNAME} . $APP_HOME/
 

Dockerfile

@@ -180,6 +180,13 @@ else
 	$(ERROR_ONLY_FOR_HOST)
 endif
 
+fish: ## Get fish shell inside symfony docker container
+ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony fish
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif
+
 ssh-nginx: ## Get bash inside nginx docker container
 ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
 	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker compose $(PROJECT_NAME) exec nginx /bin/sh

Makefile

@@ -14,7 +14,7 @@
 		"Elasticsearch"
 	],
 	"homepage": "https://github.com/systemsdk/docker-symfony-api",
-	"version": "v3.1.0",
+	"version": "v3.1.1",
 	"license": "MIT",
 	"authors": [
 		{
@@ -47,13 +47,13 @@
 		"doctrine/orm": "^2.19",
 		"dukecity/command-scheduler-bundle": "^6.0",
 		"elasticsearch/elasticsearch": "^7.17",
-		"gedmo/doctrine-extensions": "^3.15",
-		"lexik/jwt-authentication-bundle": "^3.0",
+		"gedmo/doctrine-extensions": "^3.16",
+		"lexik/jwt-authentication-bundle": "^3.1",
 		"mark-gerarts/automapper-plus-bundle": "^1.5",
 		"matomo/device-detector": "^6.3",
 		"matthiasnoback/symfony-console-form": "^6.0",
-		"nelmio/api-doc-bundle": "^4.26",
-		"nelmio/cors-bundle": "^2.4",
+		"nelmio/api-doc-bundle": "^4.28",
+		"nelmio/cors-bundle": "^2.5",
 		"phpdocumentor/reflection-docblock": "^5.4",
 		"ramsey/uuid-doctrine": "^2.1",
 		"symfony/amqp-messenger": "7.1.*",
@@ -102,7 +102,7 @@
 		"roave/security-advisories": "dev-latest",
 		"symfony/browser-kit": "7.1.*",
 		"symfony/debug-bundle": "7.1.*",
-		"symfony/maker-bundle": "^1.59",
+		"symfony/maker-bundle": "^1.60",
 		"symfony/requirements-checker": "^2.0",
 		"symfony/stopwatch": "7.1.*",
 		"symfony/var-dumper": "7.1.*",

composer.json

@@ -0,0 +1,25 @@
+# This file is part of the Symfony package.
+#
+# (c) Fabien Potencier <fabien@symfony.com>
+#
+# For the full copyright and license information, please view
+# https://symfony.com/doc/current/contributing/code/license.html
+
+function _sf_console
+    set sf_cmd (commandline -o)
+    set c (count (commandline -oc))
+
+    set completecmd "$sf_cmd[1]" "_complete" "--no-interaction" "-sfish" "-a1"
+
+    for i in $sf_cmd
+        if [ $i != "" ]
+            set completecmd $completecmd "-i$i"
+        end
+    end
+
+    set completecmd $completecmd "-c$c"
+
+    $completecmd
+end
+
+complete -c 'console' -a '(_sf_console)' -f

composer.lock

@@ -0,0 +1,5 @@
+source /home/www-data/.config/fish/completions/sf_console.fish
+
+if status is-interactive
+    # Commands to run in interactive sessions can go here
+end

docker/fish/completions/composer.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function console --wraps=/var/www/html/bin/console --description 'alias console=/var/www/html/bin/console'
+    /var/www/html/bin/console $argv;
+end

docker/fish/completions/sf_console.fish

@@ -40,6 +40,7 @@ make generate-jwt-keys                  # Generates RSA keys for JWT
 
 make ssh                                # Get bash inside symfony docker container
 make ssh-root                           # Get bash as root user inside symfony docker container
+make fish                               # Get fish shell inside symfony docker container (https://www.youtube.com/watch?v=C2a7jJTh3kU)
 make ssh-nginx                          # Get bash inside nginx docker container
 make ssh-supervisord                    # Get bash inside supervisord docker container (cron jobs running there, etc...)
 make ssh-mysql                          # Get bash inside mysql docker container

docker/fish/config.fish

@@ -242,6 +242,7 @@ make generate-jwt-keys
 
 make ssh
 make ssh-root
+make fish
 make ssh-nginx
 make ssh-supervisord
 make ssh-mysql

docker/fish/functions/console.fish

@@ -5,7 +5,7 @@
 		"php": "^8.3.0"
 	},
 	"require-dev": {
-		"rector/rector": "1.1.*",
+		"rector/rector": "1.2.*",
 		"roave/security-advisories": "dev-latest"
 	},
 	"config": {