update

Author: fey

.editorconfig

@@ -11,7 +11,10 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{yml,yaml}]
+[*.{yml,yaml,js}]
+indent_size = 2
+
+[package.json]
 indent_size = 2
 
 [{Makefile,**.mk}]

.github/dependabot.yml

@@ -0,0 +1,17 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "composer" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.github/workflows/phpci.yaml

@@ -14,19 +14,16 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.3']
+        php-versions: ['8.4']
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up PHP ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
 
-      - name: PHP Security Checker
-        uses: StephaneBour/actions-php-security-checker@1.1
-
       - name: Setup project
         run: make setup
 
@@ -51,17 +48,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: docker/setup-buildx-action@v3
-
-      - uses: docker/login-action@v1
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: docker/build-push-action@v5
+      - name: Build and push
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          cache-from: hexletcomponents/php-laravel-blog:latest
+          cache-from: ghcr.io/${{ github.repository }}:latest
           cache-to: type=inline
-          tags: hexletcomponents/php-laravel-blog:latest
+          tags: ghcr.io/${{ github.repository }}:latest

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.2-cli
+FROM php:8.4-cli
 
 RUN apt-get update && apt-get install -y \
     libpq-dev \
@@ -10,7 +10,7 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
     && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
     && php -r "unlink('composer-setup.php');"
 
-RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_24.x | bash -
 RUN apt-get install -y nodejs
 
 WORKDIR /app

Dockerfile.production

@@ -1,9 +1,13 @@
+include ./compose.mk
+
 start:
 	php artisan serve --host 0.0.0.0
 
 start-frontend:
 	npm run dev
 
+install: setup
+
 setup:
 	composer install
 	cp -n .env.example .env
@@ -42,27 +46,6 @@ lint:
 lint-fix:
 	composer phpcbf
 
-compose:
-	docker-compose up
-
-compose-test:
-	docker-compose run web make test
-
-compose-bash:
-	docker-compose run web bash
-
-compose-setup: compose-build
-	docker-compose run web make setup
-
-compose-build:
-	docker-compose build
-
-compose-db:
-	docker-compose exec db psql -U postgres
-
-compose-down:
-	docker-compose down -v
-
 ide-helper:
 	php artisan ide-helper:eloquent
 	php artisan ide-helper:gen

Makefile

@@ -7,10 +7,9 @@ Demo: https://php-laravel-blog.hexlet.app/
 
 ## Requirements
 
-* PHP ^7.4 || ^8.1
+* PHP ^8.4, Composer
+* Node.js 24+ & npm
 * Extensions: mbstring, curl, dom, xml,zip, sqlite3
-* Composer
-* Node.js & npm
 * SQLite for local
 * [heroku cli](https://devcenter.heroku.com/articles/heroku-cli#download-and-install)
 

README.md

@@ -0,0 +1,21 @@
+
+compose:
+	docker-compose up
+
+compose-test:
+	docker-compose run --rm web make test
+
+compose-bash:
+	docker-compose run --rm web bash
+
+compose-setup: compose-build
+	docker-compose run --rm web make setup
+
+compose-build:
+	docker-compose build
+
+compose-db:
+	docker-compose exec db psql -U postgres
+
+compose-down:
+	docker-compose down -v --remove-orphans

compose.mk

@@ -1,25 +1,19 @@
 {
-    "name": "laravel/laravel",
+    "name": "hexlet-components/php-laravel-blog",
     "type": "project",
-    "description": "The Laravel Framework.",
-    "keywords": [
-        "framework",
-        "laravel"
-    ],
-    "license": "MIT",
     "require": {
-        "php": ">=8",
-        "guzzlehttp/guzzle": "^7.0.1",
+        "php": ">=8.4",
+        "guzzlehttp/guzzle": "^7.9",
         "laravel/framework": "^12.0",
         "laravel/tinker": "^2.7",
         "spatie/laravel-html": "^3.5"
     },
     "require-dev": {
-        "barryvdh/laravel-ide-helper": "^3.0",
+        "barryvdh/laravel-ide-helper": "^3.6",
         "fakerphp/faker": "^1.9.1",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^8.1",
-        "phpunit/phpunit": "^11.0",
+        "phpunit/phpunit": "^12.0",
         "spatie/laravel-ignition": "^2.7",
         "squizlabs/php_codesniffer": "*"
     },