Merge pull request #25 from lion-packages/support

Updated Github Actions settings

Author: GabrielPalac

.github/workflows/php.yml

@@ -3,8 +3,8 @@ name: Lion-Route (CI Workflow)
 on:
   push:
     branches:
-      - actions-sleon
-      - actions-saco
+      - main
+      - actions
   pull_request:
     branches:
       - main
@@ -34,43 +34,23 @@ jobs:
           php-version: '8.4'
           extensions: mbstring, gd, zip
 
+      - name: Composer Install
+        run: composer install
+
       - name: Composer Validate
         run: composer validate --strict
 
       - name: Composer Check for vulnerabilities
         run: composer audit --locked
 
-      - name: Composer Install
-        run: composer install
-
       - name: Composer Dump-Autoload
         run: composer dump-autoload --optimize --strict-psr
 
-  docker-validation:
-    runs-on: ubuntu-latest
-    name: Docker Validation
-
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v4
-
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Validate Docker Compose configuration
-        run: docker compose config
-
   code-analyze:
     runs-on: ubuntu-latest
     name: PHP Code Analyze
     needs:
       - composer-validation
-      - docker-validation
 
     steps:
       - name: Check out the repository
@@ -83,13 +63,19 @@ jobs:
           extensions: mbstring, gd, zip
 
       - name: Composer Install
-        run: composer install
+        run: composer install --dev
 
       - name: PHP CodeSnifer (Src)
-        run: php -d memory_limit=-1 vendor/bin/phpcs --standard=PSR12 src/
+        run: php -d memory_limit=-1 vendor/bin/phpcs --standard=PSR12 src
+
+      - name: PHPStan (Src)
+        run: php -d memory_limit=-1 vendor/bin/phpstan analyse --level max src
+
+      - name: PHP CodeSnifer (Tests)
+        run: php -d memory_limit=-1 vendor/bin/phpcs --standard=PSR12 --ignore=tests/build/\* tests
 
-      # - name: PHPStan (Src)
-        # run: php -d memory_limit=-1 vendor/bin/phpstan analyse --level max src
+      - name: PHPStan (Tests)
+        run: php -d memory_limit=-1 vendor/bin/phpstan analyse --level max tests
 
   tests:
     runs-on: ubuntu-latest
@@ -100,28 +86,30 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Tear down containers
-        run: docker compose down --volumes --remove-orphans
-
-      - name: Stop running Docker containers (if any)
-        run: |
-          docker ps -q | xargs -r docker stop
-          docker ps -aq | xargs -r docker rm
-
-      - name: Build the Docker image
-        run: docker build -t route-app .
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.4
+          extensions: mbstring, gd, zip, xdebug
+          coverage: xdebug
+          ini-values: |
+            opcache.jit=0
+            xdebug.mode=coverage
+            xdebug.start_with_request=yes
+            xdebug.log_level=0
+          tools: composer
+
+      - name: Install php dependencies
+        run: composer install
 
-      - name: Start services using Docker Compose
-        run: |
-          docker compose -f docker-compose.yml up -d
-        env:
-          COMPOSE_PROJECT_NAME: test
+      - name: Run local server
+        run: php -S 0.0.0.0:8000 -t public &
 
-      - name: Install Composer dependencies
-        run: docker exec route-app composer install
+      - name: Run tests
+        run: php vendor/bin/phpunit --coverage-clover tests/build/logs/clover.xml --coverage-html tests/build/coverage
 
-      - name: Run PHP Tests
-        run: docker exec route-app php vendor/bin/phpunit
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          files: tests/build/logs/clover.xml
+          token: ${{ secrets.CODECOV_TOKEN_LION_ROUTE }}

.gitignore

@@ -1,4 +1,5 @@
 /.idea/
 /vendor/
-.phpunit.result.cache
 /tests/build/
+.phpunit.result.cache
+composer.lock

Dockerfile

@@ -37,12 +37,6 @@ USER lion
 
 SHELL ["/bin/bash", "--login", "-i", "-c"]
 
-# Install nvm, Node.js and npm
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash \
-    && source /home/lion/.bashrc \
-    && nvm install 20 \
-    && npm install -g npm
-
 # Install OhMyZsh
 RUN sh -c "$(wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh -O -)"
 # ----------------------------------------------------------------------------------------------------------------------
@@ -57,10 +51,7 @@ RUN wget https://github.com/Yash-Handa/logo-ls/releases/download/v1.3.7/logo-ls_
     && curl https://raw.githubusercontent.com/UTFeight/logo-ls-modernized/master/INSTALL | bash
 
 # Add configuration in .zshrc
-RUN echo 'export NVM_DIR="$HOME/.nvm"' >> /home/lion/.zshrc \
-    && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> /home/lion/.zshrc \
-    && echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"' >> /home/lion/.zshrc \
-    && echo 'alias ls="logo-ls"' >> /home/lion/.zshrc \
+RUN echo 'alias ls="logo-ls"' >> /home/lion/.zshrc \
     && source /home/lion/.zshrc
 # ----------------------------------------------------------------------------------------------------------------------
 # Copy Data

composer.json

@@ -18,14 +18,14 @@
         "lion/phroute": "^2.3"
     },
     "require-dev": {
-        "guzzlehttp/guzzle": "^7.8",
-        "lion/test": "^2.0",
-        "phpunit/phpunit": "^11.1",
-        "lion/security": "^9.1",
-        "lion/request": "^6.9",
-        "lion/exceptions": "^1.2",
-        "lion/dependency-injection": "^3.0",
+        "lion/test": "^3.2",
+        "guzzlehttp/guzzle": "^7.9",
+        "phpunit/phpunit": "^11.5",
+        "lion/security": "^11.1",
+        "lion/request": "^7.2",
+        "lion/exceptions": "^2.0",
         "phpstan/phpstan": "^2.1",
-        "squizlabs/php_codesniffer": "^3.11"
+        "squizlabs/php_codesniffer": "^3.11",
+        "lion/dependency-injection": "^4.2"
     }
 }