Skip to content

Commit

Permalink
Merge pull request #1497 from dpfaffenbauer/issue/pimcore-compatibility
Browse files Browse the repository at this point in the history
[Pimcore 6.8] make Stan compatible with Pimcore 6.8
  • Loading branch information
dpfaffenbauer authored Oct 9, 2020
2 parents d902f9f + 681dcbf commit 35d5d8a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/behat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
matrix:
php: [7.2, 7.3, 7.4]
symfony: [~3.4, ^4.0]
pimcore: [~6.6.0, dev-master]
pimcore: [~6.6.0, ~6.7.0, ~6.8.0]

steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@
"conflict": {
"dpfaffenbauer/process-manager": "<2.4",
"pimcore/pimcore": "6.1.0 || 6.1.1 || 6.5.2",
"monolog/monolog": ">=2"
"monolog/monolog": ">=2",
"symfony/monolog-bundle": "3.6.0"
},
"suggest": {
"dpfaffenbauer/process-manager": "Allows to start Processes from within Pimcore UI and also tracks the status."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class Select extends Tag
*/
public function __construct(string $repositoryName, string $nameProperty, string $type)
{
parent::__construct();

$this->repositoryName = $repositoryName;
$this->nameProperty = $nameProperty;
$this->type = $type;
Expand Down

0 comments on commit 35d5d8a

Please sign in to comment.