Merge pull request #15962 from niden/T15929-http-message-2

T15929 http message 2
phalcon · May 19, 2022 · 4728df6 · 4728df6
2 parents 2cc5c90 + c40a77e
commit 4728df6
Show file tree

Hide file tree

Showing 489 changed files with 2,608 additions and 27,168 deletions.
diff --git a/.github/actions/build-phalcon-win/action.yml b/.github/actions/build-phalcon-win/action.yml
@@ -100,37 +100,6 @@ runs:
         .\.github\actions\build-phalcon-win\Expand-Item7zip.ps1 "${{ inputs.pecl }}" "${env:TEMP}"
         .\.github\actions\build-phalcon-win\Expand-Item7zip.ps1 "${env:TEMP}\phalcon-pecl.tar" "${{ env.PHP_PECL_PATH }}\phalcon"
 
-    - name: PSR extension | init, phpize
-      shell: powershell
-      run: |
-        git clone https://github.com/jbboehr/php-psr.git ${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}
-        if (-not (Test-Path "${{ env.PHP_DEVPACK }}\include\ext\psr")) {
-          mkdir "${{ env.PHP_DEVPACK }}\include\ext\psr"
-        }
-        Set-Location "${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}"
-        phpize
-
-    - name: PSR extension | configure
-      working-directory: '${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}'
-      shell: powershell
-      run: |
-        echo "::group::Configure"
-        .\configure.bat --enable-psr
-        echo "::endgroup::"
-
-    - name: PSR extension | build
-      working-directory: '${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}'
-      shell: powershell
-      run: |
-        nmake
-        nmake install
-
-    - name: PSR extension | Inspecting Extension DLL File
-      shell: powershell
-      run: |
-        php --ri psr
-        Get-PhpExtension "${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}\${{ env.RELEASE_FOLDER }}\php_psr.dll"
-
     - name: Phalcon | phpize
       working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ env.PHALCON_VERSION }}'
       shell: powershell
@@ -141,8 +110,7 @@ runs:
       working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ env.PHALCON_VERSION }}'
       shell: powershell
       run: |
-        .\configure.bat --enable-phalcon `
-          --with-extra-libs="${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}\${{ env.RELEASE_FOLDER }}"
+        .\configure.bat --enable-phalcon
 
     - name: Phalcon | Build Project
       working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ env.PHALCON_VERSION }}'

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -49,7 +49,7 @@ jobs:
     - id: setup-zephir-ext
       name: Setup Zephir Extensions
       run: |
-        echo "::set-output name=extensions::psr-${{ env.PSR_VERSION }}, zephir_parser-${{ env.ZEPHIR_PARSER_VERSION }}"
+        echo "::set-output name=extensions::zephir_parser-${{ env.ZEPHIR_PARSER_VERSION }}"
 
   # PHP CodeSniffer inspection
   phpcs:
@@ -114,7 +114,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: ${{ env.EXTENSIONS }}, psr-${{ env.PSR_VERSION }}
+          extensions: ${{ env.EXTENSIONS }}
           ini-values: apc.enable_cli=on, session.save_path=${{ env.SESSION_SAVE_PATH }}
           tools: pecl, phpize, php-config
           coverage: xdebug

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -38,6 +38,7 @@
 
 ## Removed
 - Removed `Phalcon\Container\Container` and moved its contents to the `proxy-psr11` repo [#15928](https://github.com/phalcon/cphalcon/issues/15928)
+- Removed `Phalcon\Http\Message\*` and `Phalcon\Http\Server\*` classes. This removes PSR from Phalcon. PSR-7 available in v6 [#15929](https://github.com/phalcon/cphalcon/issues/15929)
 
 # [5.0.0beta3](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta3) (2022-02-06)
 

diff --git a/README.md b/README.md
@@ -24,8 +24,6 @@ Phalcon is written in [Zephir/C](https://zephir-lang.com/) with platform indepen
 As a result, Phalcon is available on Microsoft Windows, GNU/Linux, FreeBSD and macOS.
 You can either download a binary package for the system of your choice or build it from source.
 
-**NOTE:** Phalcon requires the [PSR PHP extension](https://github.com/jbboehr/php-psr) to be installed and enabled.
-
 ## Installation
 
 For detailed installation instructions you can check our [installation](https://docs.phalcon.io/4.0/en/installation) page in the docs.
@@ -64,18 +62,18 @@ Steps:
 
 ## Sponsors
 
-Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/phalcon#sponsor)]
+Become a sponsor and get your logo on our README on GitHub with a link to your site. [[Become a sponsor](https://opencollective.com/phalcon#sponsor)]
 
 <a href="https://opencollective.com/phalcon/#contributors">
-<img src="https://opencollective.com/phalcon/tiers/sponsors.svg?avatarHeight=48&width=800">
+<img src="https://opencollective.com/phalcon/tiers/sponsors.svg?avatarHeight=48&width=800" alt="OpenCollective Contributors">
 </a>
 
 ## Backers
 
 Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/phalcon#backer)]
 
 <a href="https://opencollective.com/phalcon/#contributors">
-<img src="https://opencollective.com/phalcon/tiers/backers.svg?avatarHeight=48&width=800&height=200">
+<img src="https://opencollective.com/phalcon/tiers/backers.svg?avatarHeight=48&width=800&height=200" alt="OpenCollective Contributors">
 </a>
 
 ## License

diff --git a/composer.json b/composer.json
@@ -6,17 +6,7 @@
     "phalcon",
     "framework",
     "high load",
-    "mvc",
-    "psr-3",
-    "psr-4",
-    "psr-7",
-    "psr-11",
-    "psr-13",
-    "psr-14",
-    "psr-15",
-    "psr-16",
-    "psr-17",
-    "psr-18"
+    "mvc"
   ],
   "license": "BSD-3-Clause",
   "authors": [
@@ -46,7 +36,6 @@
     "ext-mbstring": "*",
     "ext-msgpack": "*",
     "ext-pdo": "*",
-    "ext-psr": "^1.0",
     "ext-redis": "*",
     "ext-sqlite3": "*",
     "ext-xml": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/config.json b/config.json
@@ -20,8 +20,7 @@
       "SPL",
       "standard",
       "hash",
-      "json",
-      "psr"
+      "json"
     ]
   },
 

diff --git a/docker/7.4/Dockerfile b/docker/7.4/Dockerfile
@@ -45,8 +45,7 @@ RUN apt update -y && \
 
 # PECL Packages
 RUN pecl install -o -f redis && \
-    pecl install psr-${PSR_VERSION} \
-      igbinary \
+    pecl install igbinary \
       msgpack \
       apcu \
       yaml \
@@ -78,7 +77,6 @@ RUN docker-php-ext-install \
 
 # Install PHP extensions
 RUN docker-php-ext-enable \
-        psr \
         gettext \
         redis \
         igbinary \

diff --git a/docker/8.0/Dockerfile b/docker/8.0/Dockerfile
@@ -45,8 +45,7 @@ RUN apt update -y && \
 
 # PECL Packages
 RUN pecl install -o -f redis && \
-    pecl install psr-${PSR_VERSION} \
-      igbinary \
+    pecl install igbinary \
       msgpack \
       apcu \
       yaml \
@@ -85,7 +84,6 @@ RUN docker-php-ext-install \
 
 # Install PHP extensions
 RUN docker-php-ext-enable \
-        psr \
         gettext \
         redis \
         igbinary \

diff --git a/ext/config.m4 b/ext/config.m4
@@ -35,13 +35,11 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/filter/validation/validator/file/abstractfile.zep.c
 	phalcon/assets/assetinterface.zep.c
 	phalcon/config/configinterface.zep.c
-	phalcon/http/message/abstractcommon.zep.c
 	phalcon/mvc/model/metadatainterface.zep.c
 	phalcon/cache/adapter/adapterinterface.zep.c
 	phalcon/config/config.zep.c
 	phalcon/datamapper/query/abstractquery.zep.c
 	phalcon/db/adapter/adapterinterface.zep.c
-	phalcon/http/message/requestmethodinterface.zep.c
 	phalcon/mvc/model/metadata.zep.c
 	phalcon/annotations/adapter/adapterinterface.zep.c
 	phalcon/datamapper/pdo/connection/pdointerface.zep.c
@@ -50,7 +48,6 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/html/helper/abstractseries.zep.c
 	phalcon/html/link/interfaces/linkinterface.zep.c
 	phalcon/html/link/interfaces/linkproviderinterface.zep.c
-	phalcon/http/message/abstractmessage.zep.c
 	phalcon/logger/adapter/adapterinterface.zep.c
 	phalcon/mvc/model/resultsetinterface.zep.c
 	phalcon/paginator/adapter/adapterinterface.zep.c
@@ -67,7 +64,6 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/filter/validation/validatorcompositeinterface.zep.c
 	phalcon/flash/flashinterface.zep.c
 	phalcon/html/helper/abstractlist.zep.c
-	phalcon/http/message/stream.zep.c
 	phalcon/image/adapter/adapterinterface.zep.c
 	phalcon/logger/adapter/abstractadapter.zep.c
 	phalcon/logger/formatter/formatterinterface.zep.c
@@ -96,10 +92,9 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/flash/abstractflash.zep.c
 	phalcon/html/link/abstractlink.zep.c
 	phalcon/html/link/abstractlinkprovider.zep.c
-	phalcon/http/message/abstractrequest.zep.c
-	phalcon/http/message/responsestatuscodeinterface.zep.c
 	phalcon/image/adapter/abstractadapter.zep.c
 	phalcon/logger/formatter/abstractformatter.zep.c
+	phalcon/logger/loggerinterface.zep.c
 	phalcon/mvc/entityinterface.zep.c
 	phalcon/mvc/model/behavior.zep.c
 	phalcon/mvc/model/metadata/strategy/strategyinterface.zep.c
@@ -147,13 +142,14 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/html/link/linkprovider.zep.c
 	phalcon/html/link/serializer/serializerinterface.zep.c
 	phalcon/http/cookie/cookieinterface.zep.c
+	phalcon/http/message/requestmethodinterface.zep.c
+	phalcon/http/message/responsestatuscodeinterface.zep.c
 	phalcon/http/request/fileinterface.zep.c
 	phalcon/http/requestinterface.zep.c
 	phalcon/http/response/cookiesinterface.zep.c
 	phalcon/http/response/headersinterface.zep.c
 	phalcon/http/responseinterface.zep.c
 	phalcon/logger/abstractlogger.zep.c
-	phalcon/logger/loggerinterface.zep.c
 	phalcon/messages/messageinterface.zep.c
 	phalcon/mvc/controllerinterface.zep.c
 	phalcon/mvc/dispatcherinterface.zep.c
@@ -430,30 +426,13 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/html/tagfactory.zep.c
 	phalcon/http/cookie.zep.c
 	phalcon/http/cookie/exception.zep.c
-	phalcon/http/message/exception/invalidargumentexception.zep.c
-	phalcon/http/message/request.zep.c
-	phalcon/http/message/requestfactory.zep.c
-	phalcon/http/message/response.zep.c
-	phalcon/http/message/responsefactory.zep.c
-	phalcon/http/message/serverrequest.zep.c
-	phalcon/http/message/serverrequestfactory.zep.c
-	phalcon/http/message/stream/input.zep.c
-	phalcon/http/message/stream/memory.zep.c
-	phalcon/http/message/stream/temp.zep.c
-	phalcon/http/message/streamfactory.zep.c
-	phalcon/http/message/uploadedfile.zep.c
-	phalcon/http/message/uploadedfilefactory.zep.c
-	phalcon/http/message/uri.zep.c
-	phalcon/http/message/urifactory.zep.c
 	phalcon/http/request.zep.c
 	phalcon/http/request/exception.zep.c
 	phalcon/http/request/file.zep.c
 	phalcon/http/response.zep.c
 	phalcon/http/response/cookies.zep.c
 	phalcon/http/response/exception.zep.c
 	phalcon/http/response/headers.zep.c
-	phalcon/http/server/abstractmiddleware.zep.c
-	phalcon/http/server/abstractrequesthandler.zep.c
 	phalcon/image/adapter/gd.zep.c
 	phalcon/image/adapter/imagick.zep.c
 	phalcon/image/enum.zep.c
@@ -463,6 +442,7 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/logger/adapter/stream.zep.c
 	phalcon/logger/adapter/syslog.zep.c
 	phalcon/logger/adapterfactory.zep.c
+	phalcon/logger/enum.zep.c
 	phalcon/logger/exception.zep.c
 	phalcon/logger/formatter/json.zep.c
 	phalcon/logger/formatter/line.zep.c
@@ -642,9 +622,7 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/11__closure.zep.c
 	phalcon/12__closure.zep.c
 	phalcon/13__closure.zep.c
-	phalcon/14__closure.zep.c
-	phalcon/15__closure.zep.c
-	phalcon/16__closure.zep.c phalcon/annotations/scanner.c
+	phalcon/14__closure.zep.c phalcon/annotations/scanner.c
 	phalcon/annotations/parser.c
 	phalcon/mvc/model/orm.c
 	phalcon/mvc/model/query/scanner.c
@@ -654,7 +632,7 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/mvc/url/utils.c"
 	PHP_NEW_EXTENSION(phalcon, $phalcon_sources, $ext_shared,, )
 	PHP_ADD_BUILD_DIR([$ext_builddir/kernel/])
-	for dir in "phalcon phalcon/acl phalcon/acl/adapter phalcon/annotations phalcon/annotations/adapter phalcon/application phalcon/assets phalcon/assets/asset phalcon/assets/filters phalcon/assets/inline phalcon/autoload phalcon/cache phalcon/cache/adapter phalcon/cache/exception phalcon/cli phalcon/cli/console phalcon/cli/dispatcher phalcon/cli/router phalcon/config phalcon/config/adapter phalcon/datamapper/pdo phalcon/datamapper/pdo/connection phalcon/datamapper/pdo/exception phalcon/datamapper/pdo/profiler phalcon/datamapper/query phalcon/db phalcon/db/adapter phalcon/db/adapter/pdo phalcon/db/dialect phalcon/db/profiler phalcon/db/result phalcon/di phalcon/di/exception phalcon/di/factorydefault phalcon/di/service phalcon/dispatcher phalcon/domain/payload phalcon/encryption phalcon/encryption/crypt phalcon/encryption/crypt/exception phalcon/encryption/crypt/padding phalcon/encryption/security phalcon/encryption/security/jwt phalcon/encryption/security/jwt/exceptions phalcon/encryption/security/jwt/signer phalcon/encryption/security/jwt/token phalcon/events phalcon/factory phalcon/filter phalcon/filter/sanitize phalcon/filter/validation phalcon/filter/validation/validator phalcon/filter/validation/validator/file phalcon/filter/validation/validator/file/resolution phalcon/filter/validation/validator/file/size phalcon/filter/validation/validator/stringlength phalcon/flash phalcon/forms phalcon/forms/element phalcon/html phalcon/html/attributes phalcon/html/escaper phalcon/html/helper phalcon/html/helper/input phalcon/html/link phalcon/html/link/interfaces phalcon/html/link/serializer phalcon/http phalcon/http/cookie phalcon/http/message phalcon/http/message/exception phalcon/http/message/stream phalcon/http/request phalcon/http/response phalcon/http/server phalcon/image phalcon/image/adapter phalcon/logger phalcon/logger/adapter phalcon/logger/formatter phalcon/messages phalcon/mvc phalcon/mvc/application phalcon/mvc/controller phalcon/mvc/dispatcher phalcon/mvc/micro phalcon/mvc/model phalcon/mvc/model/behavior phalcon/mvc/model/binder phalcon/mvc/model/metadata phalcon/mvc/model/metadata/strategy phalcon/mvc/model/query phalcon/mvc/model/resultset phalcon/mvc/model/transaction phalcon/mvc/router phalcon/mvc/url phalcon/mvc/view phalcon/mvc/view/engine phalcon/mvc/view/engine/volt phalcon/paginator phalcon/paginator/adapter phalcon/session phalcon/session/adapter phalcon/storage phalcon/storage/adapter phalcon/storage/serializer phalcon/support phalcon/support/collection phalcon/support/debug phalcon/support/helper phalcon/support/helper/arr phalcon/support/helper/file phalcon/support/helper/json phalcon/support/helper/number phalcon/support/helper/str phalcon/tag phalcon/translate phalcon/translate/adapter phalcon/translate/interpolator"; do
+	for dir in "phalcon phalcon/acl phalcon/acl/adapter phalcon/annotations phalcon/annotations/adapter phalcon/application phalcon/assets phalcon/assets/asset phalcon/assets/filters phalcon/assets/inline phalcon/autoload phalcon/cache phalcon/cache/adapter phalcon/cache/exception phalcon/cli phalcon/cli/console phalcon/cli/dispatcher phalcon/cli/router phalcon/config phalcon/config/adapter phalcon/datamapper/pdo phalcon/datamapper/pdo/connection phalcon/datamapper/pdo/exception phalcon/datamapper/pdo/profiler phalcon/datamapper/query phalcon/db phalcon/db/adapter phalcon/db/adapter/pdo phalcon/db/dialect phalcon/db/profiler phalcon/db/result phalcon/di phalcon/di/exception phalcon/di/factorydefault phalcon/di/service phalcon/dispatcher phalcon/domain/payload phalcon/encryption phalcon/encryption/crypt phalcon/encryption/crypt/exception phalcon/encryption/crypt/padding phalcon/encryption/security phalcon/encryption/security/jwt phalcon/encryption/security/jwt/exceptions phalcon/encryption/security/jwt/signer phalcon/encryption/security/jwt/token phalcon/events phalcon/factory phalcon/filter phalcon/filter/sanitize phalcon/filter/validation phalcon/filter/validation/validator phalcon/filter/validation/validator/file phalcon/filter/validation/validator/file/resolution phalcon/filter/validation/validator/file/size phalcon/filter/validation/validator/stringlength phalcon/flash phalcon/forms phalcon/forms/element phalcon/html phalcon/html/attributes phalcon/html/escaper phalcon/html/helper phalcon/html/helper/input phalcon/html/link phalcon/html/link/interfaces phalcon/html/link/serializer phalcon/http phalcon/http/cookie phalcon/http/message phalcon/http/request phalcon/http/response phalcon/image phalcon/image/adapter phalcon/logger phalcon/logger/adapter phalcon/logger/formatter phalcon/messages phalcon/mvc phalcon/mvc/application phalcon/mvc/controller phalcon/mvc/dispatcher phalcon/mvc/micro phalcon/mvc/model phalcon/mvc/model/behavior phalcon/mvc/model/binder phalcon/mvc/model/metadata phalcon/mvc/model/metadata/strategy phalcon/mvc/model/query phalcon/mvc/model/resultset phalcon/mvc/model/transaction phalcon/mvc/router phalcon/mvc/url phalcon/mvc/view phalcon/mvc/view/engine phalcon/mvc/view/engine/volt phalcon/paginator phalcon/paginator/adapter phalcon/session phalcon/session/adapter phalcon/storage phalcon/storage/adapter phalcon/storage/serializer phalcon/support phalcon/support/collection phalcon/support/debug phalcon/support/helper phalcon/support/helper/arr phalcon/support/helper/file phalcon/support/helper/json phalcon/support/helper/number phalcon/support/helper/str phalcon/tag phalcon/translate phalcon/translate/adapter phalcon/translate/interpolator"; do
 		PHP_ADD_BUILD_DIR([$ext_builddir/$dir])
 	done
 	PHP_SUBST(PHALCON_SHARED_LIBADD)
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,8 +20,7 @@ @@
           "SPL",
           "standard",
           "hash",
-          "json",
-          "psr"
+          "json"
         ]
       },
@@ Expand Down @@