Updated composer dependencies, added fish shell, bash completion.

Author: DKravtsov

Diff for: .idea/codeception.xml

@@ -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 \
@@ -82,6 +84,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
@@ -97,6 +102,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 artisan="php /var/www/html/artisan"' >> /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 and config file
 COPY --chown=${USERNAME}:${USERNAME} . $APP_HOME/
 COPY --chown=${USERNAME}:${USERNAME} .env.$ENV $APP_HOME/.env

Diff for: .idea/htdocs.iml

@@ -172,6 +172,13 @@ else
 	$(ERROR_ONLY_FOR_HOST)
 endif
 
+fish: ## Get fish shell inside laravel 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) laravel fish
+else
+	$(ERROR_ONLY_FOR_HOST)
+endif
+
 ssh-supervisord: ## Get bash inside supervisord docker container (cron jobs running there, etc...)
 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 supervisord bash

Diff for: .idea/php-test-framework.xml

@@ -10,6 +10,7 @@
 
 class User extends Authenticatable
 {
+    /** @use HasFactory<\Database\Factories\UserFactory> */
     use HasFactory;
     use Notifiable;
 

Diff for: .idea/php.xml

@@ -33,14 +33,14 @@
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.8",
-		"barryvdh/laravel-ide-helper": "^3.0",
+		"barryvdh/laravel-ide-helper": "^3.1",
 		"fakerphp/faker": "^1.23",
 		"laravel/pint": "^1.13",
 		"laravel/sail": "^1.26",
 		"mockery/mockery": "^1.6",
 		"neronmoon/scriptsdev": "^0.1",
 		"nunomaduro/collision": "^8.0",
-		"phpunit/phpunit": "11.2.*",
+		"phpunit/phpunit": "11.3.*",
 		"roave/security-advisories": "dev-latest"
 	},
 	"config": {

Diff for: .idea/phpspec.xml

@@ -0,0 +1,13 @@
+function __fish_artisan_commands_with_descriptions
+    begin
+        php artisan list --raw 2>/dev/null
+        or return
+    end | grep -vE '^ ' | string replace -r '\s+' '\t'
+end
+
+function __fish_artisan_commands
+    __fish_artisan_commands_with_descriptions | cut -f 1
+end
+
+complete -c artisan -f -n 'test -f artisan; and __fish_use_subcommand' -a '(__fish_artisan_commands_with_descriptions)'
+complete -c artisan -f -n 'test -f artisan; and __fish_seen_subcommand_from help' -a '(__fish_artisan_commands)'

Diff for: Dockerfile

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

Diff for: Makefile

@@ -0,0 +1,3 @@
+function artisan --description 'Alias that helps fish recognize artisan as a command that should be completed'
+    php /var/www/html/artisan $argv
+end

Diff for: app/Models/User.php

@@ -38,6 +38,7 @@ make env-test-ci              # Creates config for test/ci environment
 
 make ssh                      # Get bash inside laravel docker container
 make ssh-root                 # Get bash as root user inside laravel docker container
+make fish                     # Get fish shell inside laravel docker container (https://www.youtube.com/watch?v=C2a7jJTh3kU)
 make ssh-supervisord          # Get bash inside supervisord docker container (cron jobs running there, etc...)
 make ssh-mysql                # Get bash inside mysql docker container
 

Diff for: composer.json

@@ -210,6 +210,7 @@ make env-test-ci
 
 make ssh
 make ssh-root
+make fish
 make ssh-supervisord
 make ssh-mysql
 

Diff for: composer.lock

@@ -5,7 +5,7 @@
 		"php": "^8.3.0"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "11.2.*",
+		"phpunit/phpunit": "11.3.*",
 		"roave/security-advisories": "dev-latest"
 	},
 	"config": {

Diff for: docker/fish/completions/artisan.fish

@@ -5,8 +5,8 @@
 		"php": "^8.3.0"
 	},
 	"require-dev": {
-		"friendsofphp/php-cs-fixer": "3.58.*",
-		"symplify/easy-coding-standard": "12.2.*",
+		"friendsofphp/php-cs-fixer": "3.62.*",
+		"symplify/easy-coding-standard": "12.3.*",
 		"roave/security-advisories": "dev-latest"
 	},
 	"config": {

Diff for: docker/fish/completions/composer.fish

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

Diff for: docker/fish/config.fish

@@ -5,7 +5,7 @@
 		"php": "^8.3.0"
 	},
 	"require-dev": {
-		"ergebnis/composer-normalize": "^2.42",
+		"ergebnis/composer-normalize": "^2.43",
 		"icanhazstring/composer-unused": "^0.8",
 		"maglnet/composer-require-checker": "^4.11",
 		"roave/security-advisories": "dev-latest"