Merge pull request #2 from niden/master

Author: Jeckerson

Diff for: .github/workflows/main.yml

@@ -19,18 +19,16 @@ on:
 
 env:
   # All versions should be declared here
-  PHALCON_VERSION: 5.0.0
+  PHALCON_VERSION: 5.0.2
 
   # For tests
   LANG: en_US.UTF-8
   LANGUAGE: en_US.UTF-8
   LC_ALL: en_US.UTF-8
 
-  # Windows specific
-  TOOLS_DIR: 'C:\tools'
-
   # PHP extensions required by Composer
-  EXTENSIONS: apcu, gettext, gd, igbinary, imagick, intl, json, mbstring, msgpack, memcached, sqlite3, yaml, redis, :memcache
+  # (adding phalcon version here until I figure out how to use the variable above)
+  EXTENSIONS: apcu, gettext, gd, igbinary, imagick, intl, json, mbstring, msgpack, memcached, phalcon-5.0.2, sqlite3, yaml, redis, :memcache
 
 jobs:
   phpcs:
@@ -45,32 +43,13 @@ jobs:
         run: docker run --rm -v $(pwd):/data cytopia/phpcs --standard=./phpcs.xml
 
   build-and-test:
-    name: tests / PHP-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.arch }}
+    name: tests / PHP-${{ matrix.php }}
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         php: [ '7.4', '8.0', '8.1' ]
-        ts: [ 'nts', 'ts' ]
-        arch: [ 'x64' ]
-
-        name:
-          - ubuntu-gcc
-          - macos-clang
-
-        # matrix names should be in next format:
-        #     {php}-{ts}-{os.name}-{compiler}-{arch}
-        include:
-          # Linux
-          - { name: ubuntu-gcc, os: ubuntu-18.04, compiler: gcc }
-          # macOS
-          - { name: macos-clang, os: macos-10.15, compiler: clang }
-          # Windows
-          - { php: '7.4', ts: 'ts',  arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
-          - { php: '7.4', ts: 'nts', arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
-          - { php: '8.0', ts: 'ts',  arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
-          - { php: '8.0', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
 
     steps:
       - uses: actions/checkout@v2
@@ -79,7 +58,7 @@ jobs:
         shell: pwsh
         run: |
           git config --global core.autocrlf false
-          $SessionSavePath = if ("${{ runner.os }}" -eq "Windows") { 'C:\temp' } else { '/tmp' }
+          $SessionSavePath = '/tmp' 
           Write-Output "SESSION_SAVE_PATH=$SessionSavePath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Setup PHP
@@ -91,7 +70,6 @@ jobs:
           tools: pecl, phpize, php-config, composer:v2
           coverage: xdebug
         env:
-          PHPTS: ${{ matrix.ts }}
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Validate composer
@@ -114,14 +92,18 @@ jobs:
       - name: Setup Tests
         shell: bash
         run: |
-          if [ "${{ runner.os }}" = "Linux" ]; then
-            ./config/ci/linux-setup-locales.sh
-          fi
-
-          cp tests/_config/.env.default .env
+          cp config/.env.default .env
           vendor/bin/codecept build
 #          php tests/_config/generate-db-schemas.php
 
       - name: Run Unit Tests
         if: always()
         run: vendor/bin/codecept run --coverage-xml=coverage-${{ matrix.php }}.xml --ext DotReporter unit
+
+      - name: Upload coverage to Codecov
+        if: success()
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{secrets.CODECOV_TOKEN}}
+          directory: ./tests/_output/
+          files: coverage-7.4.xml,coverage-8.0.xml,coverage-8.1.xml

Diff for: .gitignore

@@ -1,2 +1,3 @@
 /vendor
-.env
+/tests/_output/
+.env

Diff for: CODE_OF_CONDUCT.md

@@ -20,6 +20,6 @@ disagree.
 
 If ever conflict arises, please bring it to the attention of the maintainers
 privately. You can always find us on our [Discord](https://phalcon.io/discord)
-server or you can send us an email at [[email protected]](mailto:[email protected])
+server, or you can email us at [[email protected]](mailto:[email protected])
 
 The core team maintains the final decision on any conflict that may arise.

Diff for: README.md

@@ -1,2 +1,44 @@
-# proxy-psr16
-Package to offer PSR-16 (Cache) compatibility with Phalcon classes from the PHP userland
+# Phalcon Framework - Proxy PSR-16
+
+[![PDS Skeleton][pds_skeleton]](https://github.com/php-pds/skeleton)
+[![Phalcon CI][actions_badge]](https://github.com/phalcon/proxy-psr16/actions/workflows/main.yml) 
+[![codecov][codecov_badge]](https://codecov.io/gh/phalcon/proxy-psr16)
+
+Phalcon is an open source web framework delivered as a C extension for the PHP language providing high performance and lower resource consumption.
+
+Proxy PSR-16 is a package that offers PSR-16 compatibility with `Phalcon\Cache\Cache`. Developers that wish to use PSR-16 alongside Phalcon, can use this package which is a wrapper to `Phalcon\Cache\Cache`.
+
+## Installation
+
+You can install the package using composer
+
+```sh
+composer require phalcon/proxy-psr16
+```
+
+## Links
+
+### General
+* [Official Documentation](https://docs.phalcon.io/)
+
+### Support
+* [Forum](https://phalcon.io/forum)
+* [Discord](https://phalcon.io/discord)
+* [Stack Overflow](https://phalcon.io/so)
+
+### Social Media
+* [Telegram](https://phalcon.io/telegram)
+* [Gab](https://phalcon.io/gab)
+* [LinkedIn](https://phalcon.io/linkedin)
+* [MeWe](https://phalcon.io/mewe)
+* [Facebook](https://phalcon.io/fb)
+* [Twitter](https://phalcon.io/t)
+
+
+<!-- External links should be here -->
+[actions_badge]: https://github.com/phalcon/proxy-psr16/actions/workflows/main.yml/badge.svg
+[codecov_badge]: https://codecov.io/gh/phalcon/proxy-psr16/branch/master/graph/badge.svg?token=426jh06aRu
+
+[pds_skeleton]: https://img.shields.io/badge/pds-skeleton-blue.svg?style=flat-square
+
+[discord-badge]:            https://img.shields.io/discord/310910488152375297?label=Discord&logo=discord&style=flat-square

Diff for: composer.json

@@ -32,6 +32,7 @@
         "codeception/module-redis": "^1.4",
         "friendsofphp/php-cs-fixer": "^3.7",
         "pds/skeleton": "^1.0",
+        "phalcon/ide-stubs": "^5.0",
         "phpstan/phpstan": "^1.4",
         "squizlabs/php_codesniffer": "^3.6",
         "vimeo/psalm": "^4.22",