From 95ed3c49b2a50c4c1cb65e2f5115beef3c7fef06 Mon Sep 17 00:00:00 2001 From: Yuta Nagamiya Date: Tue, 11 May 2021 01:16:08 +0900 Subject: [PATCH 1/6] Update Laradock --- .laradock/env-development | 9 ++++++++- laradock | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.laradock/env-development b/.laradock/env-development index 0b43395..1762895 100644 --- a/.laradock/env-development +++ b/.laradock/env-development @@ -38,7 +38,7 @@ COMPOSE_PROJECT_NAME=laradock-ngmy-php-typed-array ### PHP Version ########################################### # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). -# Accepted values: 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 +# Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 PHP_VERSION=7.4 ### Phalcon Version ########################################### @@ -198,7 +198,9 @@ WORKSPACE_INSTALL_DOCKER_CLIENT=false WORKSPACE_INSTALL_LNAV=false WORKSPACE_INSTALL_PROTOC=false WORKSPACE_INSTALL_PHPDECIMAL=false +WORKSPACE_INSTALL_ZOOKEEPER=false WORKSPACE_PROTOC_VERSION=latest +WORKSPACE_INSTALL_MEMCACHED=true ### PHP_FPM ############################################### @@ -213,6 +215,7 @@ PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=true PHP_FPM_INSTALL_PHPREDIS=true PHP_FPM_INSTALL_MEMCACHED=false PHP_FPM_INSTALL_BZ2=false +PHP_FPM_INSTALL_ENCHANT=false PHP_FPM_INSTALL_GMP=false PHP_FPM_INSTALL_GNUPG=false PHP_FPM_INSTALL_XDEBUG=false @@ -258,6 +261,7 @@ PHP_FPM_INSTALL_SSHPASS=false PHP_FPM_INSTALL_MAILPARSE=false PHP_FPM_INSTALL_WKHTMLTOPDF=false PHP_FPM_INSTALL_PHPDECIMAL=false +PHP_FPM_INSTALL_ZOOKEEPER=false PHP_FPM_FFMPEG=false PHP_FPM_AUDIOWAVEFORM=false PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8" @@ -282,9 +286,11 @@ PHP_WORKER_INSTALL_IMAGEMAGICK=false PHP_WORKER_IMAGEMAGICK_VERSION=latest PHP_WORKER_INSTALL_GMP=false PHP_WORKER_INSTALL_GNUPG=false +PHP_WORKER_INSTALL_LDAP=false PHP_WORKER_INSTALL_PGSQL=false PHP_WORKER_INSTALL_MONGO=false PHP_WORKER_INSTALL_BCMATH=false +PHP_WORKER_INSTALL_MEMCACHED=false # PHP_WORKER_INSTALL_OCI8 Does not work in php5.6 version PHP_WORKER_INSTALL_OCI8=false PHP_WORKER_INSTALL_PHALCON=false @@ -322,6 +328,7 @@ LARAVEL_HORIZON_INSTALL_BZ2=false LARAVEL_HORIZON_INSTALL_GD=false LARAVEL_HORIZON_INSTALL_GMP=false LARAVEL_HORIZON_INSTALL_GNUPG=false +LARAVEL_HORIZON_INSTALL_LDAP=false LARAVEL_HORIZON_INSTALL_IMAGEMAGICK=false LARAVEL_HORIZON_IMAGEMAGICK_VERSION=latest LARAVEL_HORIZON_INSTALL_SOCKETS=false diff --git a/laradock b/laradock index 3c32dcd..4774281 160000 --- a/laradock +++ b/laradock @@ -1 +1 @@ -Subproject commit 3c32dcdcebdc6449d58417aea14fcf88d81aeed1 +Subproject commit 477428146e18c9038a4b094b01341f5fb573dd9f From 6a706c60557ecabd8d918ac04cdc19de80d8f0d7 Mon Sep 17 00:00:00 2001 From: Yuta Nagamiya Date: Tue, 11 May 2021 01:18:51 +0900 Subject: [PATCH 2/6] Update laradockctl --- .envrc.dist | 5 ++++- .laradock/commands/.gitkeep | 0 .laradock/commands/my/destroy.sh | 14 -------------- .laradock/commands/my/down.sh | 9 --------- .laradock/commands/my/phive.sh | 9 --------- .laradock/commands/my/up.sh | 22 ---------------------- laradockctl | 2 +- 7 files changed, 5 insertions(+), 56 deletions(-) create mode 100644 .laradock/commands/.gitkeep delete mode 100644 .laradock/commands/my/destroy.sh delete mode 100644 .laradock/commands/my/down.sh delete mode 100644 .laradock/commands/my/phive.sh delete mode 100644 .laradock/commands/my/up.sh diff --git a/.envrc.dist b/.envrc.dist index 370fc62..9b13551 100644 --- a/.envrc.dist +++ b/.envrc.dist @@ -1,2 +1,5 @@ export PATH=$PWD/laradockctl/bin:$PATH -export LARADOCKCTL_COMMAND_PATH=$PWD/.laradock/commands:$PWD/laradockctl/src/commands +export LARADOCKCTL_ADDITIONAL_COMMAND_DIRS=$PWD/.laradock/commands +export LARADOCKCTL_CONTAINER_NAMES=workspace +export LARADOCKCTL_ENV_FILE=$PWD/.laradock/env-development +export LARADOCKCTL_PHIVE_HOME_DIR_CONTAINER=.laradock/data/phive diff --git a/.laradock/commands/.gitkeep b/.laradock/commands/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.laradock/commands/my/destroy.sh b/.laradock/commands/my/destroy.sh deleted file mode 100644 index 8bc0d23..0000000 --- a/.laradock/commands/my/destroy.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -Ceuo pipefail - -local NAME='my:destroy' -local DESCRIPTION='Destory my development environment' - -handle() { - docker-compose down -v - local YN - read -p 'Do you want to remove data? (y/N)' YN - if [[ "${YN}" == 'y' ]]; then - sudo rm -rf ../.laradock/data/* - fi -} diff --git a/.laradock/commands/my/down.sh b/.laradock/commands/my/down.sh deleted file mode 100644 index 125d2c5..0000000 --- a/.laradock/commands/my/down.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -Ceuo pipefail - -local NAME='my:down' -local DESCRIPTION='Shut down my development environment' - -handle() { - docker-compose stop -} diff --git a/.laradock/commands/my/phive.sh b/.laradock/commands/my/phive.sh deleted file mode 100644 index 128ec0b..0000000 --- a/.laradock/commands/my/phive.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -Ceuo pipefail - -local NAME='my:phive' -local DESCRIPTION='Execute a PHIVE command' - -handle() { - docker-compose exec -u laradock workspace phive --home .laradock/data/phive "$@" -} diff --git a/.laradock/commands/my/up.sh b/.laradock/commands/my/up.sh deleted file mode 100644 index e91e585..0000000 --- a/.laradock/commands/my/up.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -Ceuo pipefail - -local NAME='my:up' -local DESCRIPTION='Start up my development environment' - -handle() { - cp -f ../.laradock/env-development .env - docker-compose up -d --build workspace - docker-compose exec -u laradock workspace composer install - docker-compose exec -u laradock workspace cp phpunit.xml.dist phpunit.xml - if ! docker-compose exec workspace bash -c 'test -f /usr/local/bin/phive'; then - docker-compose exec workspace curl -fsSL https://phar.io/releases/phive.phar -o /tmp/phive.phar - docker-compose exec workspace curl -fsSL https://phar.io/releases/phive.phar.asc -o /tmp/phive.phar.asc - docker-compose exec workspace gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys 0x9D8A98B29B2D5D79 - docker-compose exec workspace gpg --verify /tmp/phive.phar.asc /tmp/phive.phar - docker-compose exec workspace chmod +x /tmp/phive.phar - docker-compose exec workspace mv /tmp/phive.phar /usr/local/bin/phive - fi - docker-compose exec -u laradock workspace bash -c 'yes | phive --home .laradock/data/phive install --force-accept-unsigned' - docker-compose exec -u laradock workspace composer phar-extractor -} diff --git a/laradockctl b/laradockctl index ee5f326..6fa686f 160000 --- a/laradockctl +++ b/laradockctl @@ -1 +1 @@ -Subproject commit ee5f32686203083b58fcf22c912faef1c4326da5 +Subproject commit 6fa686f785181a0ea3321a9200cb6a7b08272ab6 From 0ad09b8e3cf0228a8b6c137eaeac2ba7297de5a4 Mon Sep 17 00:00:00 2001 From: Yuta Nagamiya Date: Tue, 11 May 2021 01:19:13 +0900 Subject: [PATCH 3/6] Add ignore = dirty --- .gitmodules | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9534116..9274920 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ -[submodule "laradockctl"] - path = laradockctl - url = https://github.com/ngmy/laradockctl.git [submodule "laradock"] path = laradock url = https://github.com/Laradock/laradock.git + ignore = dirty +[submodule "laradockctl"] + path = laradockctl + url = https://github.com/ngmy/laradockctl.git From 1ca9858ebc475751ef06e4078cfa3397d8500b4d Mon Sep 17 00:00:00 2001 From: Yuta Nagamiya Date: Tue, 11 May 2021 01:22:21 +0900 Subject: [PATCH 4/6] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e5e1024..2b3d81c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,7 @@ .php_cs.cache .phpunit.result.cache phpcs.xml +phpdoc.xml phpstan.neon phpunit.xml +psalm.xml From 4ea2e0c12fe4ad8e3eb2a85a18ae63c161f9304e Mon Sep 17 00:00:00 2001 From: Yuta Nagamiya Date: Tue, 11 May 2021 01:22:59 +0900 Subject: [PATCH 5/6] Update tools --- .phive/phars.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.phive/phars.xml b/.phive/phars.xml index 0793476..d7945ce 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -2,11 +2,11 @@ - + - + - + From bdd9effc8148f87d774a941147a4293d8e16984c Mon Sep 17 00:00:00 2001 From: Yuta Nagamiya Date: Tue, 11 May 2021 01:31:22 +0900 Subject: [PATCH 6/6] Fix assertions --- tests/TypedArrayPrimitiveKeyTest.php | 3 ++- tests/TypedArrayPrimitiveValueTest.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/TypedArrayPrimitiveKeyTest.php b/tests/TypedArrayPrimitiveKeyTest.php index 6e838ad..d85cc94 100644 --- a/tests/TypedArrayPrimitiveKeyTest.php +++ b/tests/TypedArrayPrimitiveKeyTest.php @@ -187,9 +187,10 @@ public function test(string $keyType, ?array $keys, $expected): void $this->expectException(get_class($expected)); } + $typedArray = $this->createInstance($keyType); + assert(is_array($keys)); - $typedArray = $this->createInstance($keyType); foreach ($keys as $key) { $typedArray[$key] = $key; } diff --git a/tests/TypedArrayPrimitiveValueTest.php b/tests/TypedArrayPrimitiveValueTest.php index a197d5a..665be96 100644 --- a/tests/TypedArrayPrimitiveValueTest.php +++ b/tests/TypedArrayPrimitiveValueTest.php @@ -110,11 +110,11 @@ public function test(string $valueType, ?array $values, Exception $exception = n $this->expectException(get_class($exception)); } - assert(is_array($values)); - // Test instantiation $typedArray = $this->createInstance($valueType); + assert(is_array($values)); + // Test setting the value without the offset foreach ($values as $key => $value) { $typedArray[$key] = $value;