Skip to content

Commit

Permalink
Merge pull request #14 from dachcom-digital/p10-6
Browse files Browse the repository at this point in the history
Pimcore 10.6 release
  • Loading branch information
solverat committed Jul 7, 2023
2 parents cc0a906 + d3e163e commit b677672
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
php: [ 8.0 ]
php: [ 8.1 ]
symfony: [ ^5.4 ]
pimcore: [ ~10.5.0 ]
pimcore: [ ~10.6.0 ]
include:
- pimcore: ~10.5.0
template_tag: v10.2.0
- pimcore: ~10.6.0
template_tag: v10.2.5
steps:
- uses: actions/checkout@v2
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
php: [ 8.0 ]
php: [ 8.1 ]
symfony: [ ^5.4 ]
pimcore: [ ~10.5.0 ]
pimcore: [ ~10.6.0 ]
include:
- pimcore: ~10.5.0
template_tag: v10.2.0
- pimcore: ~10.6.0
template_tag: v10.2.5
steps:
- uses: actions/checkout@v2
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/php-stan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
php: [ 8.0 ]
php: [ 8.1 ]
symfony: [ ^5.4 ]
pimcore: [ ~10.5.0 ]
pimcore: [ ~10.6.0 ]
include:
- pimcore: ~10.5.0
template_tag: v10.2.0
- pimcore: ~10.6.0
template_tag: v10.2.5
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This Bundle allows you to synchronise your job offers with various connectors li

| Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained | Branch |
|---------|----------------------------|----------------------------|--------------|----------------|------------|
| **2.x** | `10.5` | `5.4` | -- | Feature Branch | dev-master |
| **2.x** | `10.6` | `5.4` | -- | Feature Branch | dev-master |
| **1.x** | `6.0` - `6.9` | `3.4`, `^4.4` | 27.04.2020 | Unsupported | 1.x |


Expand Down
3 changes: 2 additions & 1 deletion src/JobsBundle/CoreExtension/JobConnectorContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ public function getFromWebserviceImport($data, $relatedObject = null, $params =
}

/**
* @param \stdClass|\stdClass[] $array
* @param mixed $array
*
* @return array
*/
Expand All @@ -290,6 +290,7 @@ protected function arrayCastRecursive($array)
}
}
}

if ($array instanceof \stdClass) {
return $this->arrayCastRecursive([$array]);
}
Expand Down

0 comments on commit b677672

Please sign in to comment.