Skip to content

Commit fb4f00b

Browse files
EdhrendalEdhrendal
authored
Merge branch 'steevanb:master' into feat-datetime_collection
2 parents c3ce9f0 + bedf5b5 commit fb4f00b

File tree

108 files changed

+1548
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1548
-88
lines changed

‎.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- uses: actions/checkout@v2
5050
- run: bin/ci/unused-scanner
5151

52-
phpunit:
52+
phpunit-symfony-6:
5353
runs-on: ubuntu-latest
5454
strategy:
5555
matrix:
@@ -65,7 +65,8 @@ jobs:
6565
strategy:
6666
matrix:
6767
php: [--php=8.2, --php=8.3]
68+
symfony: [--symfony=7.0, --symfony=7.1]
6869
steps:
6970
- uses: actions/checkout@v2
7071
- uses: ./.github/actions/ci-env
71-
- run: bin/ci/phpunit ${{ matrix.php }} --symfony=7.0
72+
- run: bin/ci/phpunit ${{ matrix.php }} ${{ matrix.symfony }}

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
[![Version](https://img.shields.io/badge/version-6.1.0-blueviolet.svg)](https://github.com/steevanb/php-collection/tree/6.1.0)
1+
[![Version](https://img.shields.io/badge/version-6.2.0-blueviolet.svg)](https://github.com/steevanb/php-collection/tree/6.2.0)
22
[![PHP](https://img.shields.io/badge/php-^8.1-blue.svg)](https://php.net)
3-
![Lines](https://img.shields.io/badge/code%20lines-3,622-blue.svg)
3+
![Lines](https://img.shields.io/badge/code%20lines-3,714-blue.svg)
44
![Downloads](https://poser.pugx.org/steevanb/php-typed-array/downloads)
55
![GitHub workflow status](https://img.shields.io/github/actions/workflow/status/steevanb/php-collection/ci.yml?branch=master)
6-
![Coverage](https://img.shields.io/badge/coverage-88%25-success.svg)
6+
![Coverage](https://img.shields.io/badge/coverage-89%25-success.svg)
77

88
## php-collection
99

‎bin/ci/composer-require-checker

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
set -eu
44

5-
readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6-
. "${ROOT_DIR}"/bin/common.inc.sh
7-
. "${ROOT_DIR}"/bin/dockerise.inc.bash
5+
readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6+
. "${ROOT_PATH}"/bin/common.inc.sh
7+
. "${ROOT_PATH}"/bin/dockerise.inc.bash
88

99
composer-require-checker \
1010
--ansi \
11-
--config-file="${ROOT_DIR}"/config/ci/composerRequireChecker.json \
11+
--config-file="${ROOT_PATH}"/config/ci/composerRequireChecker.json \
1212
"${@}"

‎bin/ci/composer-validate

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
set -eu
44

5-
readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6-
. "${ROOT_DIR}"/bin/common.inc.sh
7-
. "${ROOT_DIR}"/bin/dockerise.inc.bash
5+
readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6+
. "${ROOT_PATH}"/bin/common.inc.sh
7+
. "${ROOT_PATH}"/bin/dockerise.inc.bash
88

99
composer validate --ansi --strict

‎bin/ci/docker

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
set -eu
44

5-
readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6-
source "${ROOT_DIR}"/bin/common.inc.sh
5+
readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6+
source "${ROOT_PATH}"/bin/common.inc.sh
77

88
DOCKER_IMAGE_NAME="${CI_DOCKER_IMAGE_NAME}" \
9-
DOCKER_FILE_PATH="${ROOT_DIR}"/docker/ci/Dockerfile \
10-
source "${ROOT_DIR}"/bin/docker-build.inc.bash
9+
DOCKER_FILE_PATH="${ROOT_PATH}"/docker/ci/Dockerfile \
10+
source "${ROOT_PATH}"/bin/docker-build.inc.bash

‎bin/ci/env

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
set -eu
44

5-
readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6-
. "${ROOT_DIR}"/bin/common.inc.sh
7-
. "${ROOT_DIR}"/bin/dockerise.inc.bash
5+
readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6+
. "${ROOT_PATH}"/bin/common.inc.sh
7+
. "${ROOT_PATH}"/bin/dockerise.inc.bash
88

9-
"${ROOT_DIR}"/bin/composer install
9+
"${ROOT_PATH}"/bin/composer install

‎bin/ci/phpcs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
set -eu
44

5-
readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6-
. "${ROOT_DIR}"/bin/common.inc.sh
7-
. "${ROOT_DIR}"/bin/dockerise.inc.bash
5+
readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6+
. "${ROOT_PATH}"/bin/common.inc.sh
7+
. "${ROOT_PATH}"/bin/dockerise.inc.bash
88

9-
if [ ! -d "${ROOT_DIR}"/var/ci/phpcs ]; then
10-
mkdir -p "${ROOT_DIR}"/var/ci/phpcs
9+
if [ ! -d "${ROOT_PATH}"/var/ci/phpcs ]; then
10+
mkdir -p "${ROOT_PATH}"/var/ci/phpcs
1111
fi
1212

1313
phpcs \
@@ -17,6 +17,6 @@ phpcs \
1717
--bootstrap=config/ci/phpcs.php \
1818
--standard="${COMPOSER_HOME}"/vendor/steevanb/php-code-sniffs/src/Steevanb/ruleset.xml \
1919
--report=steevanb\\PhpCodeSniffs\\Reports\\Steevanb \
20-
--cache="${ROOT_DIR}"/var/ci/phpcs/cache \
20+
--cache="${ROOT_PATH}"/var/ci/phpcs/cache \
2121
. \
2222
"${@}"

‎bin/ci/phpdd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
set -eu
44

5-
readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6-
. "${ROOT_DIR}"/bin/common.inc.sh
7-
. "${ROOT_DIR}"/bin/dockerise.inc.bash
5+
readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6+
. "${ROOT_PATH}"/bin/common.inc.sh
7+
. "${ROOT_PATH}"/bin/dockerise.inc.bash
88

99
ls -lah ${COMPOSER_HOME}/vendor/bin
1010
ls -lah ${COMPOSER_HOME}/vendor/wapmorgan/php-deprecation-detector/bin

‎bin/ci/phpstan

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
set -eu
44

5-
readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
5+
readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
66

7-
source "${ROOT_DIR}"/bin/common.inc.sh
8-
source "${ROOT_DIR}"/bin/dockerise.inc.bash
7+
source "${ROOT_PATH}"/bin/common.inc.sh
8+
source "${ROOT_PATH}"/bin/dockerise.inc.bash
99

1010
phpVersion=
1111
phpstanParameters=
@@ -20,13 +20,13 @@ for arg in "${@}"; do
2020
fi
2121
done
2222

23-
if [ "${clearCache}" == true ] && [ -d "${ROOT_DIR}"/var/ci/phpstan ]; then
23+
if [ "${clearCache}" == true ] && [ -d "${ROOT_PATH}"/var/ci/phpstan ]; then
2424
echo "Clear cache"
25-
rm -rf "${ROOT_DIR}"/var/ci/phpstan
25+
rm -rf "${ROOT_PATH}"/var/ci/phpstan
2626
fi
2727

2828
if [ "${phpVersion}" == "" ]; then
29-
php8.2 "${ROOT_DIR}"/bin/ci/phpstan.php ${phpstanParameters}
29+
php8.3 "${ROOT_PATH}"/bin/ci/phpstan.php ${phpstanParameters}
3030
else
3131
echo "PHP ${phpVersion}"
3232

‎bin/ci/phpunit

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
set -eu
44

5-
readonly ROOT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6-
. "${ROOT_DIR}"/bin/common.inc.sh
7-
. "${ROOT_DIR}"/bin/dockerise.inc.bash
5+
readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
6+
. "${ROOT_PATH}"/bin/common.inc.sh
7+
. "${ROOT_PATH}"/bin/dockerise.inc.bash
88

99
phpVersion=
1010
symfonyVersion=
@@ -20,7 +20,7 @@ for arg in "${@}"; do
2020
done
2121

2222
if [ "${phpVersion}" == "" ] || [ "${symfonyVersion}" == "" ]; then
23-
php8.2 "${ROOT_DIR}"/bin/ci/phpunit.php "${@}"
23+
php8.2 "${ROOT_PATH}"/bin/ci/phpunit.php "${@}"
2424
else
2525
echo "PHP ${phpVersion} - Symfony ${symfonyVersion}"
2626

0 commit comments

Comments
 (0)