[pull] master from tienvx:master

.github/workflows/main.yml

@@ -7,39 +7,41 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.0']
-    name: PHP ${{ matrix.php-versions }}
+        php-versions: ['8.1']
+        dependency-versions: ['lowest', 'highest']
+    name: PHP ${{ matrix.php-versions }} with ${{ matrix.dependency-versions }} versions of Composer dependencies
     steps:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-versions }}
         coverage: pcov
-        tools: phpstan, phpcs, php-cs-fixer:3, phpunit, composer:v2
-        #extensions: mbstring, intl
+        tools: phpstan, phpcs, php-cs-fixer:3
 
     - name: Checkout
       uses: actions/checkout@v2
 
     - name: Install
-      run: composer install
+      uses: "ramsey/composer-install@v2"
+      with:
+        dependency-versions: ${{ matrix.dependency-versions }}
 
     - name: Run PHP CS
-      run: phpcs --standard=PSR12 src tests
+      run: phpcs --standard=PSR12 src tests config
 
     - name: Run PHP CS Fixer
       run: php-cs-fixer fix --diff --dry-run
 
     - name: Run PHPStan
-      run: phpstan analyse src tests
+      run: phpstan analyse src tests config
 
     - name: Test & Generate Code Coverage
-      run: phpunit
+      run: ./vendor/bin/phpunit
 
     - name: Upload coverage results to Coveralls
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         composer global require php-coveralls/php-coveralls
         php-coveralls --coverage_clover=clover.xml -v
-      if: matrix.php-versions == '7.4'
+      if: ${{ github.event_name == 'push' && matrix.php-versions == '8.1' && matrix.dependency-versions == 'lowest' }}

.php-cs-fixer.php

@@ -3,6 +3,7 @@
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__.'/src')
     ->in(__DIR__.'/tests')
+    ->in(__DIR__.'/config')
 ;
 
 $config = new PhpCsFixer\Config();

CHANGELOG.md

@@ -1,6 +1,15 @@
 CHANGELOG
 =========
 
+3.0.0
+-----
+
+* Only support Symfony ^6.1
+* Only support PHP ^8.1
+* Isolate model variables <> place variables <> transition variables on runtime
+* Support transition expression, make it user friendly
+* Add custom commands (upload, download, update/assert clipboard)
+
 2.0.0
 -----
 

README.md

@@ -4,8 +4,8 @@ This Bundle is a core library for [Sicope Model][sicope-model], a Model-Based Te
 
 ## Requirements
 
-* PHP 8.0
-* Symfony 5.3
+* PHP 8.1
+* Symfony 6.1
 * See also the `require` section of [composer.json](composer.json)
 
 ## Installation
@@ -24,8 +24,9 @@ vendor/bin/phpunit
 ## Validate code with coding standards
 
 ```shell
-phpcs --standard=PSR12 src tests
-phpstan analyse src tests
+phpcs --standard=PSR12 src tests config
+php-cs-fixer fix --diff --dry-run
+phpstan analyse src tests config
 ```
 
 ## Built With
@@ -65,7 +66,7 @@ This package is available under the [MIT license](LICENSE).
 [version-image]: https://img.shields.io/github/v/release/tienvx/mbt-bundle?include_prereleases
 
 [php-version-url]: https://packagist.org/packages/tienvx/mbt-bundle
-[php-version-image]: http://img.shields.io/badge/php-8.0.0+-ff69b4.svg
+[php-version-image]: http://img.shields.io/badge/php-8.1.0+-ff69b4.svg
 
 [contributors]: https://github.com/tienvx/mbt-bundle/graphs/contributors
 [pulls]: https://github.com/tienvx/mbt-bundle/pulls

composer.json

@@ -16,20 +16,21 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-json": "*",
-        "doctrine/annotations": "^1.13",
+        "doctrine/doctrine-bundle": "^2.6",
         "doctrine/orm": "^2.8",
-        "florianv/petrinet": "^2.1",
         "jmgq/a-star": "^2.1",
         "php-webdriver/webdriver": "^1.11",
-        "symfony/config": "^5.4",
-        "symfony/dependency-injection": "^5.4",
-        "symfony/expression-language": "^5.4",
-        "symfony/http-kernel": "^5.4",
-        "symfony/messenger": "^5.4",
-        "symfony/validator": "^5.4",
-        "tienvx/single-color-petrinet": "^1.3"
+        "symfony/config": "^6.1",
+        "symfony/dependency-injection": "^6.1",
+        "symfony/expression-language": "^6.1",
+        "symfony/http-client": "^6.1",
+        "symfony/http-kernel": "^6.1",
+        "symfony/messenger": "^6.1",
+        "symfony/validator": "^6.1",
+        "tienvx/single-color-petrinet": "^1.5",
+        "tienvx/assignments-evaluator-bundle": "^1.0.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"

config/definition.php

@@ -0,0 +1,22 @@
+<?php
+
+use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
+use Tienvx\Bundle\MbtBundle\TienvxMbtBundle;
+
+return static function (DefinitionConfigurator $definition) {
+    $definition->rootNode()
+        ->children()
+            ->scalarNode(TienvxMbtBundle::WEBDRIVER_URI)
+                ->isRequired()
+                ->cannotBeEmpty()
+                ->defaultValue('http://localhost:4444')
+            ->end()
+        ->end()
+        ->children()
+            ->scalarNode(TienvxMbtBundle::UPLOAD_DIR)
+                ->isRequired()
+                ->cannotBeEmpty()
+            ->end()
+        ->end()
+    ;
+};