phalcon · Jeckerson · Nov 19, 2024 · Nov 18, 2024 · Nov 19, 2024 · Nov 19, 2024
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -127,7 +127,7 @@ jobs:
       - run: composer install --prefer-dist
 
       - name: "Run Unit Tests"
-        run: vendor/bin/phpunit --coverage-clover=coverage.xml
+        run: composer test-coverage
 
       - name: SonarQube Cloud Scan
         uses: SonarSource/sonarcloud-github-action@master

diff --git a/bin/.gitkeep b/bin/.gitkeep
diff --git a/composer.json b/composer.json
@@ -18,14 +18,15 @@
         },
         {
             "name": "Contributors",
-            "homepage": "https://github.com/phalcon/cphalcon/graphs/contributors"
+            "homepage": "https://github.com/phalcon/volt/graphs/contributors"
         }
     ],
     "require": {
         "php": ">=8.1",
         "ext-mbstring": "*"
     },
     "require-dev": {
+        "pds/skeleton": "^1.0",
         "phalcon/ide-stubs": "^5.8",
         "phpstan/phpstan": "^1.11",
         "phpunit/phpunit": "^10.5",
@@ -44,7 +45,7 @@
             "Phalcon\\Volt\\": "src/"
         },
         "files": [
-            "files/parser.php"
+            "resources/files/parser.php"
         ]
     },
     "autoload-dev": {
@@ -54,9 +55,9 @@
     },
     "support": {
         "email": "support@phalcon.io",
-        "issues": "https://github.com/phalcon/cphalcon/issues",
-        "forum": "https://phalcon.io/forum/",
-        "source": "https://github.com/phalcon/cphalcon",
+        "issues": "https://github.com/phalcon/volt/issues",
+        "discussions": "https://phalcon.io/discussions/",
+        "source": "https://github.com/phalcon/volt",
         "docs": "https://phalcon.io/docs/",
         "rss": "https://blog.phalcon.io/rss"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/config/.gitkeep b/config/.gitkeep
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   phalcon-volt-8.1:
     container_name: phalcon-volt-8.1
     hostname: phalcon-volt-8.1
-    build: .docker/8.1
+    build: resources/docker/8.1
     tty: true
     working_dir: /srv
     volumes:

diff --git a/docs/.gitkeep b/docs/.gitkeep
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          bootstrap="./phpunit.php"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-         cacheResultFile="./tests/support/output"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          colors="true"
-         verbose="true"
          processIsolation="true"
->
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
-    <testsuites>
-        <testsuite name="volt/unit">
-            <directory>./tests/unit</directory>
-        </testsuite>
-    </testsuites>
+         cacheDirectory="./tests/support/output/.phpunit.cache">
+  <testsuites>
+    <testsuite name="volt/unit">
+      <directory>./tests/unit</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/public/.gitkeep b/public/.gitkeep
diff --git a/qodana.yaml b/qodana.yaml
diff --git a/resources/.gitkeep b/resources/.gitkeep
diff --git a/.docker/8.1/.bashrc → resources/docker/8.1/.bashrc b/.docker/8.1/.bashrc → resources/docker/8.1/.bashrc
diff --git a/.docker/8.1/Dockerfile → resources/docker/8.1/Dockerfile b/.docker/8.1/Dockerfile → resources/docker/8.1/Dockerfile
diff --git a/.docker/8.1/extra.ini → resources/docker/8.1/extra.ini b/.docker/8.1/extra.ini → resources/docker/8.1/extra.ini
diff --git a/files/parser.php → resources/files/parser.php b/files/parser.php → resources/files/parser.php
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,3 +1,20 @@
 sonar.projectKey=phalcon_volt
 sonar.organization=phalcon
-sonar.tests=tests
+
+sonar.sources=src/
+sonar.exclusions=vendor/**,cv/**,tests/**
+#sonar.inclusions=
+
+# Source encoding
+sonar.sourceEncoding=UTF-8
+
+sonar.language=php
+
+# Path to tests
+sonar.tests=tests/
+#sonar.test.exclusions=
+#sonar.test.inclusions=
+sonar.php.coverage.reportPaths=tests/support/coverage.xml
+
+# Exclusions for copy-paste detection
+#sonar.cpd.exclusions=
diff --git a/tests/unit/Compiler/CompileStringCest.php → tests/unit/Compiler/CompileStringTest.php b/tests/unit/Compiler/CompileStringCest.php → tests/unit/Compiler/CompileStringTest.php
@@ -17,7 +17,7 @@
 use Phalcon\Volt\Exception;
 use PHPUnit\Framework\TestCase;
 
-class CompileStringCest extends TestCase
+final class CompileStringTest extends TestCase
 {
     /**
      * Tests Phalcon\Mvc\View\Engine\Volt\Compiler :: compileString()

diff --git a/tests/unit/ExpressionCest.php → tests/unit/ExpressionTest.php b/tests/unit/ExpressionCest.php → tests/unit/ExpressionTest.php
@@ -16,7 +16,7 @@
 use Phalcon\Volt\Compiler;
 use PHPUnit\Framework\TestCase;
 
-final class ExpressionCest extends TestCase
+final class ExpressionTest extends TestCase
 {
     /**
      * Tests Phalcon\Mvc\View\Engine\Volt\Compiler :: expression()

diff --git a/tests/unit/FunctionCallCest.php → tests/unit/FunctionCallTest.php b/tests/unit/FunctionCallCest.php → tests/unit/FunctionCallTest.php
@@ -16,7 +16,7 @@
 use Phalcon\Volt\Compiler;
 use PHPUnit\Framework\TestCase;
 
-class FunctionCallCest extends TestCase
+final class FunctionCallTest extends TestCase
 {
     /**
      * @dataProvider getExamples

diff --git a/tests/unit/SetOptionCest.php → tests/unit/SetOptionTest.php b/tests/unit/SetOptionCest.php → tests/unit/SetOptionTest.php
@@ -16,7 +16,7 @@
 use Phalcon\Volt\Compiler;
 use PHPUnit\Framework\TestCase;
 
-final class SetOptionCest extends TestCase
+final class SetOptionTest extends TestCase
 {
     /**
      * Tests Phalcon\Mvc\View\Engine\Volt\Compiler :: setOption() - autoescape