Skip to content

Commit

Permalink
Merge pull request #1603 from fey/update-deps-2023-12-11
Browse files Browse the repository at this point in the history
Update deps
  • Loading branch information
fey authored Dec 11, 2023
2 parents 7ec6ce4 + e9c9e2e commit 5a47a0b
Show file tree
Hide file tree
Showing 9 changed files with 1,955 additions and 1,743 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ jobs:
steps:
- uses: actions/checkout@v4

# - uses: satackey/[email protected]

- name: Run CI
run: |
make ci
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: jpribyl/[email protected]

- name: Run CI
run: |
make ci
63 changes: 33 additions & 30 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,47 +1,50 @@
FROM ubuntu:22.04

WORKDIR /app

ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Moscow
ENV PATH=node_modules/.bin:$PATH

WORKDIR /app

RUN apt-get update && apt-get install -y \
ENV PHP_VERSION=8.3
ENV NODE_MAJOR=20

RUN apt-get update \
&& apt-get -y install software-properties-common \
&& add-apt-repository ppa:ondrej/php \
&& add-apt-repository -y ppa:plt/racket \
&& apt-get install -y \
make \
curl \
gnupg \
git \
libpq-dev \
libzip-dev \
racket \
sqlite3 \
unzip \
zip \
php \
php-bcmath \
php-exif \
php-pdo \
php-pgsql \
php-pgsql \
php-zip \
php-xdebug \
php-dom \
php-xml \
php-mbstring \
php-sqlite3 \
php-curl
racket

RUN apt-get update && apt-get install -y \
software-properties-common \
&& rm -rf /var/lib/apt/lists/*

RUN add-apt-repository -y ppa:plt/racket
RUN apt update && apt-get install -y racket
RUN raco pkg install sicp

RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
COPY ./xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini

RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
RUN apt-get update && apt-get install -y nodejs && npm install -g [email protected]
RUN apt-get install -y \
php${PHP_VERSION} \
php${PHP_VERSION}-bcmath \
php${PHP_VERSION}-exif \
php${PHP_VERSION}-pdo \
php${PHP_VERSION}-pgsql \
php${PHP_VERSION}-pgsql \
php${PHP_VERSION}-zip \
php${PHP_VERSION}-xdebug \
php${PHP_VERSION}-dom \
php${PHP_VERSION}-xml \
php${PHP_VERSION}-mbstring \
php${PHP_VERSION}-sqlite3 \
php${PHP_VERSION}-curl

RUN mkdir -p /etc/apt/keyrings
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_MAJOR}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
RUN apt update && apt-get install nodejs -y

ENV PATH=node_modules/.bin:$PATH
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
COPY ./xdebug.ini /etc/php/{$PHP_VERSION}/conf.d/docker-php-ext-xdebug.ini
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ test-coverage:
XDEBUG_MODE=coverage php artisan test --coverage-clover build/logs/clover.xml

analyse:
composer exec phpstan analyse -v -- --memory-limit=512M --xdebug
composer exec phpstan analyse -v -- --memory-limit=512M

check: test lint analyse

Expand Down
73 changes: 36 additions & 37 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"license": "MIT",
"require": {
"php": "^8.1.0",
"php": "^8.3.0",
"ext-bcmath": "*",
"ext-curl": "*",
"ext-dom": "*",
Expand All @@ -21,53 +21,52 @@
"ext-sqlite3": "*",
"ext-xml": "*",
"ext-zip": "*",
"browner12/helpers": "^3.4",
"dedoc/scramble": "^0.8.3",
"diglactic/laravel-breadcrumbs": "^v8.1.0",
"doctrine/dbal": "^3.4",
"browner12/helpers": "^3.5",
"dedoc/scramble": "^0.8.5",
"diglactic/laravel-breadcrumbs": "^v8.1.1",
"doctrine/dbal": "^3.7",
"erusev/parsedown": "^1.7",
"fakerphp/faker": "^1.20",
"graham-campbell/github": "^v12.2.0",
"guzzlehttp/guzzle": "^7.4",
"hemp/presenter": "^2.5",
"http-interop/http-factory-guzzle": "^1.0",
"fakerphp/faker": "^1.23",
"graham-campbell/github": "^v12.4.0",
"guzzlehttp/guzzle": "^7.8",
"hemp/presenter": "^2.7",
"http-interop/http-factory-guzzle": "^1.2",
"iben12/laravel-statable": "^1.5",
"laminas/laminas-diactoros": "^3.2",
"laracasts/flash": "^3.0",
"laraeast/laravel-bootstrap-forms": "^5.2",
"laravel/framework": "^10.0",
"laravel/helpers": "^1.1",
"laravel/legacy-factories": "^1.1",
"laravel/socialite": "^5.0",
"laravel/tinker": "^2.7",
"laravel/ui": "^v4.2.1",
"laravelcollective/html": "^6.0",
"mcamara/laravel-localization": "^1.7",
"mikehaertl/php-shellcommand": "^1.6",
"rollbar/rollbar-laravel": "~8.0",
"sebdesign/laravel-state-machine": "^3.3",
"spatie/laravel-activitylog": "^4.0.0",
"spatie/laravel-query-builder": "^5.0",
"spatie/laravel-sitemap": "^6.0",
"symfony/yaml": "^6.1"
"laminas/laminas-diactoros": "^3.3",
"laracasts/flash": "^3.2",
"laraeast/laravel-bootstrap-forms": "^5.4",
"laravel/framework": "^10.35",
"laravel/helpers": "^1.7",
"laravel/legacy-factories": "^1.3",
"laravel/socialite": "^5.11",
"laravel/tinker": "^2.8",
"laravel/ui": "^v4.2.3",
"laravelcollective/html": "^6.4",
"mcamara/laravel-localization": "^1.8",
"mikehaertl/php-shellcommand": "^1.7",
"rollbar/rollbar-laravel": "^8.0",
"sebdesign/laravel-state-machine": "^3.4",
"spatie/laravel-activitylog": "^4.7.3",
"spatie/laravel-query-builder": "^5.6",
"spatie/laravel-sitemap": "^6.4",
"symfony/yaml": "^6.4"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.2",
"barryvdh/laravel-ide-helper": "^2.6",
"beyondcode/laravel-dump-server": "^1.8",
"spatie/laravel-ignition": "^2.0",
"barryvdh/laravel-debugbar": "^3.9",
"barryvdh/laravel-ide-helper": "^2.13",
"beyondcode/laravel-dump-server": "^1.9",
"spatie/laravel-ignition": "^2.3",
"heroku/heroku-buildpack-php": "^231",
"mockery/mockery": "^1.3",
"nunomaduro/collision": "^7.9.0",
"nunomaduro/larastan": "^2.1",
"phpunit/phpunit": "^10.3",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^7.10",
"larastan/larastan": "^2.7",
"phpunit/phpunit": "^10.5",
"roave/security-advisories": "dev-master",
"slevomat/coding-standard": "dev-master",
"squizlabs/php_codesniffer": "*"
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
Expand Down
Loading

0 comments on commit 5a47a0b

Please sign in to comment.