From 60cf4766ade0fb007c75537ee4c41317d86d8b9b Mon Sep 17 00:00:00 2001
From: mscherer <mark.scherer@spryker.com>
Date: Wed, 4 Jan 2023 20:07:08 +0100
Subject: [PATCH 1/3] Init Cake5 upgrade

---
 .github/workflows/ci.yml | 10 +++++-----
 .php_cs                  | 13 -------------
 .styleci.yml             | 14 --------------
 README.md                |  4 ++--
 composer.json            | 22 ++++++++++++----------
 5 files changed, 19 insertions(+), 44 deletions(-)
 delete mode 100644 .php_cs
 delete mode 100644 .styleci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d09e4b..39d402c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,11 +13,11 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['7.4', '8.2']
+                php-version: ['8.1', '8.2']
                 db-type: [sqlite, mysql, pgsql]
                 prefer-lowest: ['']
                 include:
-                    - php-version: '7.4'
+                    - php-version: '8.1'
                       db-type: 'sqlite'
                       prefer-lowest: 'prefer-lowest'
 
@@ -55,7 +55,7 @@ jobs:
 
             - name: Run PHPUnit
               run: |
-                  if [[ ${{ matrix.php-version }} == '7.4' && ${{ matrix.db-type }} == 'sqlite' ]]; then
+                  if [[ ${{ matrix.php-version }} == '8.1' && ${{ matrix.db-type }} == 'sqlite' ]]; then
                     vendor/bin/phpunit --coverage-clover=coverage.xml
                   else
                     vendor/bin/phpunit
@@ -65,7 +65,7 @@ jobs:
               run: if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then vendor/bin/validate-prefer-lowest -m; fi
 
             - name: Code Coverage Report
-              if: success() && matrix.php-version == '7.4' && matrix.db-type == 'sqlite'
+              if: success() && matrix.php-version == '8.1' && matrix.db-type == 'sqlite'
               uses: codecov/codecov-action@v3
 
     validation:
@@ -78,7 +78,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '7.4'
+                  php-version: '8.1'
                   extensions: mbstring
                   coverage: none
 
diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index 23ba165..0000000
--- a/.php_cs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/*
- * In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
- * with composer.
- *
- * @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
- * @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
- */
-
-use SLLH\StyleCIBridge\ConfigBridge;
-
-return ConfigBridge::create();
diff --git a/.styleci.yml b/.styleci.yml
deleted file mode 100644
index 5328b61..0000000
--- a/.styleci.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-preset: symfony
-
-finder:
-    exclude:
-        - "spec"
-    path:
-        - "src"
-        - "tests"
-
-enabled:
-    - short_array_syntax
-
-disabled:
-    - phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198
diff --git a/README.md b/README.md
index 58aac09..72c1024 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,12 @@
 [![Build Status](https://img.shields.io/travis/php-http/cakephp-adapter.svg?style=flat-square)](https://travis-ci.org/php-http/cakephp-adapter)
 [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/php-http/cakephp-adapter.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/cakephp-adapter)
 [![Quality Score](https://img.shields.io/scrutinizer/g/php-http/cakephp-adapter.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/cakephp-adapter)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.4-8892BF.svg)](https://php.net/)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.1-8892BF.svg)](https://php.net/)
 [![Total Downloads](https://img.shields.io/packagist/dt/php-http/cakephp-adapter.svg?style=flat-square)](https://packagist.org/packages/php-http/cakephp-adapter)
 
 [HTTPlug](http://httplug.io) adapter for the [CakePHP](https://cakephp.org/) HTTP library.
 
-This branch is for use with CakePHP 4.2+.
+This branch is for use with CakePHP 5.0+.
 
 ## Install
 
diff --git a/composer.json b/composer.json
index 465ba20..2b655d0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,13 @@
 {
     "name": "php-http/cakephp-adapter",
-    "description": "Cake adapter for PHP-HTTP",
+    "description": "CakePHP adapter for PHP-HTTP",
     "license": "MIT",
-    "keywords": ["cakephp", "httplug", "http", "cake"],
+    "keywords": [
+        "cakephp",
+        "httplug",
+        "http",
+        "cake"
+    ],
     "homepage": "https://httplug.io",
     "authors": [
         {
@@ -11,10 +16,10 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.1",
         "php-http/httplug": "^2.0",
         "php-http/discovery": "^1.0",
-        "cakephp/cakephp": "^4.2"
+        "cakephp/cakephp": "5.x-dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
@@ -35,11 +40,6 @@
         "psr/http-client-implementation": "1.0",
         "php-http/client-implementation": "1.0"
     },
-    "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
-    },
-    "prefer-stable": true,
     "scripts": {
         "test": "phpunit",
         "test-coverage": "phpunit --log-junit webroot/coverage/unitreport.xml --coverage-html webroot/coverage --coverage-clover webroot/coverage/coverage.xml",
@@ -50,6 +50,7 @@
         "cs-check": "phpcs --extensions=php",
         "cs-fix": "phpcbf --extensions=php"
     },
+    "prefer-stable": true,
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
@@ -59,5 +60,6 @@
         "branch-alias": {
             "dev-master": "0.3-dev"
         }
-    }
+    },
+    "minimum-stability": "dev"
 }

From 4cf902f94686fa9dbf7cddb129c7ee3a13f74aac Mon Sep 17 00:00:00 2001
From: Mapiiik <45870742+Mapiiik@users.noreply.github.com>
Date: Sat, 16 Sep 2023 11:25:04 +0200
Subject: [PATCH 2/3] Use stable CakePHP 5.x by default

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2b655d0..abd4f7f 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "php": ">=8.1",
         "php-http/httplug": "^2.0",
         "php-http/discovery": "^1.0",
-        "cakephp/cakephp": "5.x-dev"
+        "cakephp/cakephp": "^5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

From 7ea7cfe161edf205d3824e910a9c197c5eb417e6 Mon Sep 17 00:00:00 2001
From: Mark Scherer <dereuromark@users.noreply.github.com>
Date: Thu, 21 Sep 2023 12:05:56 +0200
Subject: [PATCH 3/3] Fix up min stability

---
 composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index abd4f7f..20deabf 100644
--- a/composer.json
+++ b/composer.json
@@ -60,6 +60,5 @@
         "branch-alias": {
             "dev-master": "0.3-dev"
         }
-    },
-    "minimum-stability": "dev"
+    }
 }