Skip to content

Commit a3f5548

Browse files
author
DKravtsov
committed
Updated composer dependencies, added fish shell, bash completion.
1 parent 5c5d5a3 commit a3f5548

29 files changed

+2422
-1996
lines changed

.idea/codeception.xml

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/htdocs.iml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/php-test-framework.xml

-14
This file was deleted.

.idea/php.xml

+116-117
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/phpspec.xml

-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

+14
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ RUN if [ "$BUILD_ARGUMENT_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_ENV
2525

2626
# install all the dependencies and enable PHP modules
2727
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
28+
bash-completion \
29+
fish \
2830
procps \
2931
nano \
3032
git \
@@ -82,6 +84,9 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
8284
RUN chmod +x /usr/bin/composer
8385
ENV COMPOSER_ALLOW_SUPERUSER 1
8486

87+
# Enable Composer autocompletion
88+
RUN composer completion bash > /etc/bash_completion.d/composer
89+
8590
# add supervisor
8691
RUN mkdir -p /var/log/supervisor
8792
COPY --chown=root:root ./docker/general/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
@@ -97,6 +102,15 @@ WORKDIR $APP_HOME
97102

98103
USER ${USERNAME}
99104

105+
# Add necessary stuff to bash autocomplete
106+
RUN echo 'source /usr/share/bash-completion/bash_completion' >> /home/${USERNAME}/.bashrc \
107+
&& echo 'alias artisan="php /var/www/html/artisan"' >> /home/${USERNAME}/.bashrc
108+
109+
# copy fish configs
110+
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/completions/ /home/${USERNAME}/.config/fish/completions/
111+
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/functions/ /home/${USERNAME}/.config/fish/functions/
112+
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/config.fish /home/${USERNAME}/.config/fish/config.fish
113+
100114
# copy source files and config file
101115
COPY --chown=${USERNAME}:${USERNAME} . $APP_HOME/
102116
COPY --chown=${USERNAME}:${USERNAME} .env.$ENV $APP_HOME/.env

Makefile

+7
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,13 @@ else
172172
$(ERROR_ONLY_FOR_HOST)
173173
endif
174174

175+
fish: ## Get fish shell inside laravel docker container
176+
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
177+
@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
178+
else
179+
$(ERROR_ONLY_FOR_HOST)
180+
endif
181+
175182
ssh-supervisord: ## Get bash inside supervisord docker container (cron jobs running there, etc...)
176183
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
177184
@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

app/Models/User.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
class User extends Authenticatable
1212
{
13+
/** @use HasFactory<\Database\Factories\UserFactory> */
1314
use HasFactory;
1415
use Notifiable;
1516

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
},
3434
"require-dev": {
3535
"bamarni/composer-bin-plugin": "^1.8",
36-
"barryvdh/laravel-ide-helper": "^3.0",
36+
"barryvdh/laravel-ide-helper": "^3.1",
3737
"fakerphp/faker": "^1.23",
3838
"laravel/pint": "^1.13",
3939
"laravel/sail": "^1.26",
4040
"mockery/mockery": "^1.6",
4141
"neronmoon/scriptsdev": "^0.1",
4242
"nunomaduro/collision": "^8.0",
43-
"phpunit/phpunit": "11.2.*",
43+
"phpunit/phpunit": "11.3.*",
4444
"roave/security-advisories": "dev-latest"
4545
},
4646
"config": {

0 commit comments

Comments
 (0)