From 34aa58595bf6ed876f887734edf9412630e043a2 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 11:13:35 -0600 Subject: [PATCH 01/34] add laravel 10 support --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 31d704c..b310c95 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "laravel 7", "laravel 8", "laravel 9", + "laravel 10", "workos", "sdk", "sso" @@ -21,12 +22,12 @@ ], "require": { "php": ">=5.6.0", - "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0", "workos/workos-php": "^v3.2.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.15 || ^3.6", - "phpunit/phpunit": "^5.7 || ^9.5.10" + "phpunit/phpunit": "^5.7 || ^10.1" }, "suggest": { "laravel/framework": "For testing" From 4d9fb0a0083db52e6d36b6cd25994cac9ab2a7f9 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 11:18:00 -0600 Subject: [PATCH 02/34] Add Laravel 8 unit test --- .semaphore/semaphore.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 7c90752..a7d5587 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -39,3 +39,7 @@ blocks: commands: - bash bin/restore-cache-and-update-deps 7 - composer run-script test + - name: Laravel 8-ish + commands: + - bash bin/restore-cache-and-update-deps 8 + - composer run-script test From ea01064ab312603bbc7d123c7ed200a327e6ca42 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 11:20:49 -0600 Subject: [PATCH 03/34] Add laravel 8 to bash script --- bin/restore-cache-and-update-deps | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index c488c9f..84fbcb5 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -21,6 +21,11 @@ case ${1} in echo "7...ish" laravel_version="^7.5" ;; + + "8") + echo "8" + laravel_version="^8.76.2" + ;; *) printf "\nError: Specify either 5, 6, or 7 for Laravel version\n" From f480626aae01b51a14f69704f6f3a41c357499d8 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 11:24:55 -0600 Subject: [PATCH 04/34] Add laravel 9 unit test --- .semaphore/semaphore.yml | 6 +++++- bin/restore-cache-and-update-deps | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index a7d5587..071d682 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -39,7 +39,11 @@ blocks: commands: - bash bin/restore-cache-and-update-deps 7 - composer run-script test - - name: Laravel 8-ish + - name: Laravel 8 + commands: + - bash bin/restore-cache-and-update-deps 8 + - composer run-script test + - name: Laravel 9 commands: - bash bin/restore-cache-and-update-deps 8 - composer run-script test diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 84fbcb5..bdb38b9 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -26,6 +26,11 @@ case ${1} in echo "8" laravel_version="^8.76.2" ;; + + "9") + echo "9" + laravel_version="^9.52.7" + ;; *) printf "\nError: Specify either 5, 6, or 7 for Laravel version\n" From ca891a19044ec72fd5b01aa5270a076038f16aeb Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 11:26:35 -0600 Subject: [PATCH 05/34] Add Laravel 10 unit test --- .semaphore/semaphore.yml | 4 ++++ bin/restore-cache-and-update-deps | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 071d682..145b869 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -47,3 +47,7 @@ blocks: commands: - bash bin/restore-cache-and-update-deps 8 - composer run-script test + - name: Laravel 10 + commands: + - bash bin/restore-cache-and-update-deps 8 + - composer run-script test diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index bdb38b9..8c1acc1 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -31,6 +31,11 @@ case ${1} in echo "9" laravel_version="^9.52.7" ;; + + "10") + echo "10" + laravel_version="^10.9.0" + ;; *) printf "\nError: Specify either 5, 6, or 7 for Laravel version\n" From 3b90ce5b26c2adafe2689358ebece3ba38b51b55 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 11:28:19 -0600 Subject: [PATCH 06/34] Update unit test laravel 9 & 10 --- .semaphore/semaphore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 145b869..79e4b7d 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -45,9 +45,9 @@ blocks: - composer run-script test - name: Laravel 9 commands: - - bash bin/restore-cache-and-update-deps 8 + - bash bin/restore-cache-and-update-deps 9 - composer run-script test - name: Laravel 10 commands: - - bash bin/restore-cache-and-update-deps 8 + - bash bin/restore-cache-and-update-deps 10 - composer run-script test From 1f2bf79a109f3e2d1e579f66300abafdf8b6fa37 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 11:29:51 -0600 Subject: [PATCH 07/34] drop laravel 10 unit tests --- .semaphore/semaphore.yml | 4 ---- bin/restore-cache-and-update-deps | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 79e4b7d..e71caac 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -47,7 +47,3 @@ blocks: commands: - bash bin/restore-cache-and-update-deps 9 - composer run-script test - - name: Laravel 10 - commands: - - bash bin/restore-cache-and-update-deps 10 - - composer run-script test diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 8c1acc1..657b0f3 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -32,10 +32,10 @@ case ${1} in laravel_version="^9.52.7" ;; - "10") - echo "10" - laravel_version="^10.9.0" - ;; + # "10") + # echo "10" + # laravel_version="^10.9.0" + # ;; *) printf "\nError: Specify either 5, 6, or 7 for Laravel version\n" From 9ee4f296ea2e79b827a051b548feaaaaf9aecc85 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 11:33:09 -0600 Subject: [PATCH 08/34] Install PHP 8 for laravel 9 unit test --- .semaphore/semaphore.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index e71caac..4d6f0a6 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -45,5 +45,7 @@ blocks: - composer run-script test - name: Laravel 9 commands: + - phpbrew --no-progress install 8.0.7 + - phpbrew use php-8.0.7 - bash bin/restore-cache-and-update-deps 9 - composer run-script test From 669ab33dc59105beeb21e430f457ad9ab96781fd Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 11:51:07 -0600 Subject: [PATCH 09/34] Install composer for Laravel 9 unit test --- .semaphore/semaphore.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 4d6f0a6..f408c0c 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -47,5 +47,6 @@ blocks: commands: - phpbrew --no-progress install 8.0.7 - phpbrew use php-8.0.7 + - phpbrew app get composer - bash bin/restore-cache-and-update-deps 9 - composer run-script test From f4d4d85fe1911d26167366eb1f2c5cf87feb2d87 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 12:18:57 -0600 Subject: [PATCH 10/34] Add composer installation to Laravel 9 unit test --- .semaphore/semaphore.yml | 1 - bin/restore-cache-and-update-deps | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index f408c0c..4d6f0a6 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -47,6 +47,5 @@ blocks: commands: - phpbrew --no-progress install 8.0.7 - phpbrew use php-8.0.7 - - phpbrew app get composer - bash bin/restore-cache-and-update-deps 9 - composer run-script test diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 657b0f3..28a47b2 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -30,6 +30,9 @@ case ${1} in "9") echo "9" laravel_version="^9.52.7" + echo "install composer" + php composer-setup.php --install-dir=bin --filename=composer + mv composer.phar /usr/local/bin/composer ;; # "10") From 83b6e6c4a5c910f64816ba280a4c7d9eef6da6e3 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 12:32:40 -0600 Subject: [PATCH 11/34] Alternate composer install attempt --- bin/restore-cache-and-update-deps | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 28a47b2..bc61002 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -31,8 +31,16 @@ case ${1} in echo "9" laravel_version="^9.52.7" echo "install composer" - php composer-setup.php --install-dir=bin --filename=composer - mv composer.phar /usr/local/bin/composer + if [[ ! `command -v composer 2>/dev/null` ]] + then + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + php composer-setup.php + php -r "unlink('composer-setup.php');" + + php composer.phar u + else + composer u + fi ;; # "10") From bcbfe780082f08e47005493877a969b1e6be2611 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 12:50:33 -0600 Subject: [PATCH 12/34] update dependencies --- .semaphore/semaphore.yml | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 4d6f0a6..5f2bac0 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -45,7 +45,7 @@ blocks: - composer run-script test - name: Laravel 9 commands: - - phpbrew --no-progress install 8.0.7 - - phpbrew use php-8.0.7 + - phpbrew --no-progress install 8.1.0 + - phpbrew use php-8.1.0 - bash bin/restore-cache-and-update-deps 9 - composer run-script test diff --git a/composer.json b/composer.json index b310c95..e30b5a2 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.15 || ^3.6", - "phpunit/phpunit": "^5.7 || ^10.1" + "phpunit/phpunit": "^9.5.10 || ^10.1" }, "suggest": { "laravel/framework": "For testing" From 240a807eb191b9a97a5306b8f65ca4011d30fc21 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 12:52:16 -0600 Subject: [PATCH 13/34] fix call to composer --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 5f2bac0..1799e8b 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -48,4 +48,4 @@ blocks: - phpbrew --no-progress install 8.1.0 - phpbrew use php-8.1.0 - bash bin/restore-cache-and-update-deps 9 - - composer run-script test + - php composer.phar run-script test From 77fc93d30aca7c0c27467caad674278b98a92cf4 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 13:13:54 -0600 Subject: [PATCH 14/34] add no-scripts flag --- .semaphore/semaphore.yml | 1 + bin/restore-cache-and-update-deps | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 1799e8b..efe6a5e 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -48,4 +48,5 @@ blocks: - phpbrew --no-progress install 8.1.0 - phpbrew use php-8.1.0 - bash bin/restore-cache-and-update-deps 9 + - php composer.phar update --no-scripts - php composer.phar run-script test diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index bc61002..ce482d8 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -37,7 +37,6 @@ case ${1} in php composer-setup.php php -r "unlink('composer-setup.php');" - php composer.phar u else composer u fi From 7ea18119f240ba31d03e957c1f714eb5b2672dc8 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 13:23:59 -0600 Subject: [PATCH 15/34] add composer install command --- .semaphore/semaphore.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index efe6a5e..1e04cc7 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -48,5 +48,6 @@ blocks: - phpbrew --no-progress install 8.1.0 - phpbrew use php-8.1.0 - bash bin/restore-cache-and-update-deps 9 + - php composer.phar install - php composer.phar update --no-scripts - php composer.phar run-script test From a1302d4ae9005b5d0edd92f576d302099c50ba4c Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 14:26:54 -0600 Subject: [PATCH 16/34] further testing --- .semaphore/semaphore.yml | 4 +++- bin/restore-cache-and-update-deps | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 1e04cc7..4b8fdaa 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -48,6 +48,8 @@ blocks: - phpbrew --no-progress install 8.1.0 - phpbrew use php-8.1.0 - bash bin/restore-cache-and-update-deps 9 - - php composer.phar install + - composer require laravel/framework=^9.52.7 + # - composer u + # - php composer.phar install - php composer.phar update --no-scripts - php composer.phar run-script test diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index ce482d8..c8b53ae 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -54,8 +54,8 @@ case ${1} in esac echo "Install desired Laravel version then update everything" -composer require laravel/framework=${laravel_version} -composer u +# composer require laravel/framework=${laravel_version} +# composer u echo "Attempt to store cache in case of an initial miss" cache store $KEY ./vendor From f9bc411935bc7f418c8388231fdd50e2f5ef4a93 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 14:42:54 -0600 Subject: [PATCH 17/34] fix error --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 4b8fdaa..165b503 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -48,7 +48,7 @@ blocks: - phpbrew --no-progress install 8.1.0 - phpbrew use php-8.1.0 - bash bin/restore-cache-and-update-deps 9 - - composer require laravel/framework=^9.52.7 + - php composer.phar require laravel/framework=^9.52.7 # - composer u # - php composer.phar install - php composer.phar update --no-scripts From 14f4d6e68fd0cec837324b35f78d4ac1fb828440 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 15:13:15 -0600 Subject: [PATCH 18/34] update formatting laravel 9 unit test --- .semaphore/semaphore.yml | 4 ---- bin/restore-cache-and-update-deps | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 165b503..1799e8b 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -48,8 +48,4 @@ blocks: - phpbrew --no-progress install 8.1.0 - phpbrew use php-8.1.0 - bash bin/restore-cache-and-update-deps 9 - - php composer.phar require laravel/framework=^9.52.7 - # - composer u - # - php composer.phar install - - php composer.phar update --no-scripts - php composer.phar run-script test diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index c8b53ae..0a1669a 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -10,21 +10,33 @@ case ${1} in "5") echo "5...ish" laravel_version="^5.8" + echo "Install desired Laravel version then update everything" + composer require laravel/framework=${laravel_version} + composer u ;; "6") echo "6...ish" laravel_version="^6.18" + echo "Install desired Laravel version then update everything" + composer require laravel/framework=${laravel_version} + composer u ;; "7") echo "7...ish" laravel_version="^7.5" + echo "Install desired Laravel version then update everything" + composer require laravel/framework=${laravel_version} + composer u ;; "8") echo "8" laravel_version="^8.76.2" + echo "Install desired Laravel version then update everything" + composer require laravel/framework=${laravel_version} + composer u ;; "9") @@ -36,6 +48,8 @@ case ${1} in php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" php composer-setup.php php -r "unlink('composer-setup.php');" + php composer.phar require laravel/framework=${laravel_version} + php composer.phar update --no-scripts else composer u @@ -53,10 +67,6 @@ case ${1} in ;; esac -echo "Install desired Laravel version then update everything" -# composer require laravel/framework=${laravel_version} -# composer u - echo "Attempt to store cache in case of an initial miss" cache store $KEY ./vendor From ec855d33c3558fa531b827665c16ebf94a8abe91 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 15:25:46 -0600 Subject: [PATCH 19/34] Add Laravel 10 unit test --- .semaphore/semaphore.yml | 6 ++++++ bin/restore-cache-and-update-deps | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 1799e8b..1c80e0a 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -49,3 +49,9 @@ blocks: - phpbrew use php-8.1.0 - bash bin/restore-cache-and-update-deps 9 - php composer.phar run-script test + - name: Laravel 10 + commands: + - phpbrew --no-progress install 8.1.0 + - phpbrew use php-8.1.0 + - bash bin/restore-cache-and-update-deps 10 + - php composer.phar run-script test diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 0a1669a..c6aa917 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -50,19 +50,26 @@ case ${1} in php -r "unlink('composer-setup.php');" php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts + + "10") + echo "9" + laravel_version="^10.9.0" + echo "install composer" + if [[ ! `command -v composer 2>/dev/null` ]] + then + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + php composer-setup.php + php -r "unlink('composer-setup.php');" + php composer.phar require laravel/framework=${laravel_version} + php composer.phar update --no-scripts else composer u fi ;; - - # "10") - # echo "10" - # laravel_version="^10.9.0" - # ;; *) - printf "\nError: Specify either 5, 6, or 7 for Laravel version\n" + printf "\nError: Specify either 5, 6, 7, 8, 9, or 10 for Laravel version\n" exit 1 ;; esac From cb20414c7835fcb74b0073324713c71b45ad8965 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 15:27:47 -0600 Subject: [PATCH 20/34] fix typo --- bin/restore-cache-and-update-deps | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index c6aa917..6426c88 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -50,7 +50,8 @@ case ${1} in php -r "unlink('composer-setup.php');" php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts - + ;; + "10") echo "9" laravel_version="^10.9.0" @@ -62,7 +63,8 @@ case ${1} in php -r "unlink('composer-setup.php');" php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts - + ;; + else composer u fi From 1cdba82ef0e7f162108750d9cdda50176d73407d Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 15:29:31 -0600 Subject: [PATCH 21/34] fix yet another typo --- bin/restore-cache-and-update-deps | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 6426c88..4d1f924 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -63,7 +63,6 @@ case ${1} in php -r "unlink('composer-setup.php');" php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts - ;; else composer u From 8fbfb0472b106f1fb409003e0f0b46ced547d55f Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 15:34:41 -0600 Subject: [PATCH 22/34] testing bash formatting --- bin/restore-cache-and-update-deps | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 4d1f924..24136ef 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -50,11 +50,11 @@ case ${1} in php -r "unlink('composer-setup.php');" php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts - ;; - - "10") - echo "9" - laravel_version="^10.9.0" + ;; + + "10") + echo "10" + laravel_version="^9.52.7" echo "install composer" if [[ ! `command -v composer 2>/dev/null` ]] then @@ -63,14 +63,20 @@ case ${1} in php -r "unlink('composer-setup.php');" php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts - + ;; + else composer u fi ;; + + # "10") + # echo "10" + # laravel_version="^10.9.0" + # ;; *) - printf "\nError: Specify either 5, 6, 7, 8, 9, or 10 for Laravel version\n" + printf "\nError: Specify either 5, 6, or 7 for Laravel version\n" exit 1 ;; esac From 3d7f17e8b8e828da1bbfffe1a63c1ae3eada0893 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 15:36:09 -0600 Subject: [PATCH 23/34] further testing --- bin/restore-cache-and-update-deps | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 24136ef..ae13f8a 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -51,19 +51,6 @@ case ${1} in php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts ;; - - "10") - echo "10" - laravel_version="^9.52.7" - echo "install composer" - if [[ ! `command -v composer 2>/dev/null` ]] - then - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php - php -r "unlink('composer-setup.php');" - php composer.phar require laravel/framework=${laravel_version} - php composer.phar update --no-scripts - ;; else composer u From 62a11e9175103ce54b8970a842f024e9184c6b4b Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 15:38:05 -0600 Subject: [PATCH 24/34] readd Laravel 10 unit test --- bin/restore-cache-and-update-deps | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index ae13f8a..f371e7a 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -56,7 +56,24 @@ case ${1} in composer u fi ;; - + ;; + + "10") + echo "10" + laravel_version="^9.52.7" + echo "install composer" + if [[ ! `command -v composer 2>/dev/null` ]] + then + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + php composer-setup.php + php -r "unlink('composer-setup.php');" + php composer.phar require laravel/framework=${laravel_version} + php composer.phar update --no-scripts + ;; + else + composer u + fi + ;; # "10") # echo "10" # laravel_version="^10.9.0" From 65de4c940f6f8361fb1340b104a50468c24afd6c Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 15:39:21 -0600 Subject: [PATCH 25/34] drop ;; --- bin/restore-cache-and-update-deps | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index f371e7a..02cdf4f 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -50,13 +50,10 @@ case ${1} in php -r "unlink('composer-setup.php');" php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts - ;; - else composer u fi ;; - ;; "10") echo "10" @@ -69,7 +66,6 @@ case ${1} in php -r "unlink('composer-setup.php');" php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts - ;; else composer u fi From 9e79ca9616e04c03ac1e28ef419e4111e6593039 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 16:00:05 -0600 Subject: [PATCH 26/34] drop comments in bash script --- bin/restore-cache-and-update-deps | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 02cdf4f..266a28d 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -57,7 +57,7 @@ case ${1} in "10") echo "10" - laravel_version="^9.52.7" + laravel_version="^10.9.0" echo "install composer" if [[ ! `command -v composer 2>/dev/null` ]] then @@ -70,13 +70,9 @@ case ${1} in composer u fi ;; - # "10") - # echo "10" - # laravel_version="^10.9.0" - # ;; *) - printf "\nError: Specify either 5, 6, or 7 for Laravel version\n" + printf "\nError: Specify either 5, 6, 7, 8, 9, or 10 for Laravel version\n" exit 1 ;; esac From fb82ca91cb08dec79a8bf2aa60928b98077ea5bb Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 16:32:09 -0600 Subject: [PATCH 27/34] drop old versions of illuminate/support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e30b5a2..4933c23 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ ], "require": { "php": ">=5.6.0", - "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0", + "illuminate/support": "^9.0 || ^10.0", "workos/workos-php": "^v3.2.0" }, "require-dev": { From 83ae8b2df3bcc2d8d23ab8914588c445a01bf3ee Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Wed, 3 May 2023 16:35:38 -0600 Subject: [PATCH 28/34] revert laravel version 10 to 10.0 --- bin/restore-cache-and-update-deps | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 266a28d..60d6018 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -57,7 +57,7 @@ case ${1} in "10") echo "10" - laravel_version="^10.9.0" + laravel_version="^10.0.0" echo "install composer" if [[ ! `command -v composer 2>/dev/null` ]] then diff --git a/composer.json b/composer.json index 4933c23..e30b5a2 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ ], "require": { "php": ">=5.6.0", - "illuminate/support": "^9.0 || ^10.0", + "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0", "workos/workos-php": "^v3.2.0" }, "require-dev": { From 7a894bb822b9526d02e1e0d018972be38e29e7a6 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 4 May 2023 11:28:58 -0600 Subject: [PATCH 29/34] remove laravel 10 composer step --- bin/restore-cache-and-update-deps | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 60d6018..afcb12b 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -64,7 +64,6 @@ case ${1} in php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" php composer-setup.php php -r "unlink('composer-setup.php');" - php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts else composer u From 19bd8d77f07174e05483191402b0058a9f64d4ee Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 4 May 2023 13:38:46 -0600 Subject: [PATCH 30/34] testing --- bin/restore-cache-and-update-deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index afcb12b..a38aee5 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -35,7 +35,7 @@ case ${1} in echo "8" laravel_version="^8.76.2" echo "Install desired Laravel version then update everything" - composer require laravel/framework=${laravel_version} + #composer require laravel/framework=${laravel_version} composer u ;; From 0dc177febaca7d6b3048ab31678a82f1d68eabd3 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 4 May 2023 13:43:22 -0600 Subject: [PATCH 31/34] further testing --- bin/restore-cache-and-update-deps | 2 +- composer.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index a38aee5..afcb12b 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -35,7 +35,7 @@ case ${1} in echo "8" laravel_version="^8.76.2" echo "Install desired Laravel version then update everything" - #composer require laravel/framework=${laravel_version} + composer require laravel/framework=${laravel_version} composer u ;; diff --git a/composer.json b/composer.json index e30b5a2..56cf8d3 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ ], "require": { "php": ">=5.6.0", - "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0", "workos/workos-php": "^v3.2.0" }, "require-dev": { From c1f050e23e29426e2123200e9b9efe84d7ff0364 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 4 May 2023 14:51:44 -0600 Subject: [PATCH 32/34] remove illuminate/support requirement --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 56cf8d3..297ce7a 100644 --- a/composer.json +++ b/composer.json @@ -22,11 +22,12 @@ ], "require": { "php": ">=5.6.0", - "workos/workos-php": "^v3.2.0" + "workos/workos-php": "^v3.3.0", + "laravel/framework": "^10.0.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.15 || ^3.6", - "phpunit/phpunit": "^9.5.10 || ^10.1" + "phpunit/phpunit": "^5.7 || ^10.1" }, "suggest": { "laravel/framework": "For testing" From 5ac55aa80620f3db6ede134882895e6f7ebeb0aa Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 4 May 2023 14:52:15 -0600 Subject: [PATCH 33/34] remove line from local testing --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 297ce7a..48de87a 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,7 @@ ], "require": { "php": ">=5.6.0", - "workos/workos-php": "^v3.3.0", - "laravel/framework": "^10.0.0" + "workos/workos-php": "^v3.3.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.15 || ^3.6", From c892d37d81a7e94a3853b3dbd679d9dcc07bf32b Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 4 May 2023 15:10:31 -0600 Subject: [PATCH 34/34] add laravel 10 installation to bash script --- bin/restore-cache-and-update-deps | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index afcb12b..60d6018 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -64,6 +64,7 @@ case ${1} in php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" php composer-setup.php php -r "unlink('composer-setup.php');" + php composer.phar require laravel/framework=${laravel_version} php composer.phar update --no-scripts else composer u