Fix indent

Use absolute pathe
phalcon · Jan 18, 2020 · 86ab932 · 86ab932
1 parent 0430647
commit 86ab932
Show file tree

Hide file tree

Showing 2 changed files with 112 additions and 109 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -82,9 +82,9 @@ jobs:
           sudo make install
           echo 'extension="zephir_parser.so"' | sudo tee "/etc/php/7.4/cli/conf.d/zephir_parser.ini"
 
-      - name: Setup GitHub Token
+      - name: Setup Composer Token
         run: |
-          # To increase the GitHub rate limit we're use GitHub authentication
+          # To increase the Composer rate limit we're use GitHub authentication
           if [ -n "${{ secrets.COMPOSER_TOKEN }}" ]; then
             composer config github-oauth.github.com "${{ secrets.COMPOSER_TOKEN }}"
           fi
@@ -177,9 +177,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Setup GitHub Token
+      - name: Setup Composer Token
         run: |
-          # To increase the GitHub rate limit we're use GitHub authentication
+          # To increase the Composer rate limit we're use GitHub authentication
           if [ -n "${{ secrets.COMPOSER_TOKEN }}" ]; then
             composer config github-oauth.github.com "${{ secrets.COMPOSER_TOKEN }}"
           fi
@@ -203,7 +203,7 @@ jobs:
           sudo pecl -v install phalcon-pecl/phalcon-pecl.tgz
 
       - name: Verify install
-        run: php -m | grep phalcon
+        run: php --ri phalcon
 
       - name: Install packages
         run: composer install --prefer-dist --ignore-platform-reqs
@@ -244,7 +244,8 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Install requirements for ext-imagick #Remove after setup-php 1.7.4 https://github.com/shivammathur/setup-php/issues/155#issuecomment-575774700
+      #TODO(ruudboon): Remove after setup-php 1.7.4 and add imagick to extensions. https://github.com/shivammathur/setup-php/issues/155#issuecomment-575774700
+      - name: Install requirements for ext-imagick
         run: brew install pkg-config imagemagick
 
       - name: Setup PHP
@@ -253,7 +254,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           ini-values: apc.enable_cli=on, session.save_path=/tmp
           tools: pecl
-          extensions: mbstring, intl, json, imagick, yaml, apcu
+          extensions: mbstring, intl, json, yaml, apcu
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -286,7 +287,7 @@ jobs:
           sudo pecl -v install phalcon-pecl/phalcon-pecl.tgz
 
       - name: Verify install
-        run: php -m | grep phalcon
+        run: php --ri phalcon
 
       - name: Install packages
         run: composer install --prefer-dist --ignore-platform-reqs
@@ -355,9 +356,9 @@ jobs:
           echo "::set-env name=EXTENSION_NAME::phalcon"
           echo "::set-env name=EXTENSION_FILE::php_phalcon.dll"
 
-      - name: Setup GitHub Token
+      - name: Setup Composer Token
         run: |
-          # To increase the GitHub rate limit we're use GitHub authentication
+          # To increase the Composer rate limit we're use GitHub authentication
           if ("${{ secrets.COMPOSER_TOKEN }}" -ne "") {
               composer config github-oauth.github.com ${{ secrets.COMPOSER_TOKEN }}
           }
@@ -425,19 +426,21 @@ jobs:
           Import-Module .\.ci\win-ci-tools.psm1
           Expand-Item7zip "phalcon-pecl\phalcon-pecl.tgz" "${env:PHPROOT}\pecl"
 
+      # TODO (ruudboon): Replace path with PHP_SRC env
       - name: Compile Phalcon
         shell: powershell
         run: |
           cd ${env:PHPROOT}\pecl
-          ${env:PHP_SRC_PATH}\buildconf
-          ${env:PHP_SRC_PATH}\configure --enable-snapshot-build
+          dir C:\tools\php-src
+          C:\tools\php-src\buildconf
+          C:\tools\php-src\configure --enable-snapshot-build
           nmake
 
       - name: Enable Phalcon
         run: Enable-PhpExtension -Extension 'Phalcon' -Path "${env:PHPROOT}"
 
       - name: Verify install
-        run: php -m | grep phalcon
+        run: php --ri phalcon
 
       - name: Install packages
         run: composer install --prefer-dist --ignore-platform-reqs

diff --git a/composer.json b/composer.json
@@ -1,100 +1,100 @@
 {
-    "name": "phalcon/cphalcon",
-    "description": "Phalcon is an open source web framework delivered as a C extension for the PHP language providing high performance and lower resource consumption.",
-    "keywords": [
-        "extension",
-        "phalcon",
-        "framework",
-        "high load",
-        "mvc",
-        "psr-7",
-        "psr-17"
-    ],
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Phalcon Team",
-            "email": "[email protected]",
-            "homepage": "https://phalcon.io/en/team"
-        },
-        {
-            "name": "Contributors",
-            "homepage": "https://github.com/phalcon/cphalcon/graphs/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.2 <8.0"
+  "name": "phalcon/cphalcon",
+  "description": "Phalcon is an open source web framework delivered as a C extension for the PHP language providing high performance and lower resource consumption.",
+  "keywords": [
+    "extension",
+    "phalcon",
+    "framework",
+    "high load",
+    "mvc",
+    "psr-7",
+    "psr-17"
+  ],
+  "license": "BSD-3-Clause",
+  "authors": [
+    {
+      "name": "Phalcon Team",
+      "email": "[email protected]",
+      "homepage": "https://phalcon.io/en/team"
     },
-    "provide": {
-        "psr/cache": "^1.0",
-        "psr/container": "^1.0",
-        "psr/event-dispatcher": "^0.7.0",
-        "psr/event-dispatcher-message": "^0.6.0",
-        "psr/event-dispatcher-task": "^0.6.0",
-        "psr/http-client": "^1.0",
-        "psr/http-factory": "^1.0",
-        "psr/http-message": "^1.0",
-        "psr/http-server-handler": "^1.0",
-        "psr/http-server-middleware": "^1.0",
-        "psr/link": "^1.0",
-        "psr/log": "^1.1",
-        "psr/simple-cache": "^1.0"
-    },
-    "require-dev": {
-        "ext-dom": "*",
-        "ext-gd": "*",
-        "ext-json": "*",
-        "ext-libxml": "*",
-        "ext-mbstring": "*",
-        "ext-psr": "^0.7",
-        "ext-xml": "*",
-        "ext-redis": "*",
-        "ext-igbinary": "*",
-        "ext-msgpack": "*",
-        "ext-apcu": "*",
-        "ext-imagick": "*",
-        "ext-intl": "*",
-        "ext-iconv": "*",
-        "ext-sqlite3": "*",
-        "codeception/codeception": "^4.0",
-        "friendsofphp/php-cs-fixer": "~2.0",
-        "mustache/mustache": "^2.12",
-        "predis/predis": "^1.1",
-        "squizlabs/php_codesniffer": "^3.4",
-        "twig/twig": "~1.36",
-        "vlucas/phpdotenv": "^2.5",
-        "codeception/module-asserts": "^1.0.0",
-        "codeception/module-cli": "^1.0.0",
-        "codeception/module-filesystem": "^1.0.0",
-        "codeception/module-phalcon4": "^1.0.3",
-        "codeception/module-redis": "^1.0.0",
-        "codeception/module-db": "^1.0.0",
-        "codeception/module-apc": "^1.0.0"
-    },
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
-        "sort-packages": true
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Zephir\\Optimizers\\": "optimizers/",
-            "Phalcon\\Test\\Unit\\": "tests/unit/",
-            "Phalcon\\Test\\Integration\\": "tests/integration/",
-            "Phalcon\\Test\\Controllers\\": "tests/_data/fixtures/controllers/",
-            "Phalcon\\Test\\Fixtures\\": "tests/_data/fixtures/",
-            "Phalcon\\Test\\Models\\": "tests/_data/fixtures/models/",
-            "Phalcon\\Test\\Module\\": "tests/_support/Module/",
-            "Phalcon\\Test\\Listener\\": "tests/_data/listener/",
-            "Phalcon\\Test\\Db\\": "tests/_data/db/"
-        }
-    },
-    "support": {
-        "email": "[email protected]",
-        "issues": "https://github.com/phalcon/cphalcon/issues",
-        "forum": "https://phalcon.link/forum/",
-        "source": "https://github.com/phalcon/cphalcon",
-        "docs": "https://phalcon.link/docs/",
-        "rss": "https://blog.phalcon.io/rss"
+    {
+      "name": "Contributors",
+      "homepage": "https://github.com/phalcon/cphalcon/graphs/contributors"
+    }
+  ],
+  "require": {
+    "php": ">=7.2 <8.0"
+  },
+  "provide": {
+    "psr/cache": "^1.0",
+    "psr/container": "^1.0",
+    "psr/event-dispatcher": "^0.7.0",
+    "psr/event-dispatcher-message": "^0.6.0",
+    "psr/event-dispatcher-task": "^0.6.0",
+    "psr/http-client": "^1.0",
+    "psr/http-factory": "^1.0",
+    "psr/http-message": "^1.0",
+    "psr/http-server-handler": "^1.0",
+    "psr/http-server-middleware": "^1.0",
+    "psr/link": "^1.0",
+    "psr/log": "^1.1",
+    "psr/simple-cache": "^1.0"
+  },
+  "require-dev": {
+    "ext-dom": "*",
+    "ext-gd": "*",
+    "ext-json": "*",
+    "ext-libxml": "*",
+    "ext-mbstring": "*",
+    "ext-psr": "^0.7",
+    "ext-xml": "*",
+    "ext-redis": "*",
+    "ext-igbinary": "*",
+    "ext-msgpack": "*",
+    "ext-apcu": "*",
+    "ext-imagick": "*",
+    "ext-intl": "*",
+    "ext-iconv": "*",
+    "ext-sqlite3": "*",
+    "codeception/codeception": "^4.0",
+    "friendsofphp/php-cs-fixer": "~2.0",
+    "mustache/mustache": "^2.12",
+    "predis/predis": "^1.1",
+    "squizlabs/php_codesniffer": "^3.4",
+    "twig/twig": "~1.36",
+    "vlucas/phpdotenv": "^2.5",
+    "codeception/module-asserts": "^1.0.0",
+    "codeception/module-cli": "^1.0.0",
+    "codeception/module-filesystem": "^1.0.0",
+    "codeception/module-phalcon4": "^1.0.3",
+    "codeception/module-redis": "^1.0.0",
+    "codeception/module-db": "^1.0.0",
+    "codeception/module-apc": "^1.0.0"
+  },
+  "config": {
+    "optimize-autoloader": true,
+    "preferred-install": "dist",
+    "sort-packages": true
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Zephir\\Optimizers\\": "optimizers/",
+      "Phalcon\\Test\\Unit\\": "tests/unit/",
+      "Phalcon\\Test\\Integration\\": "tests/integration/",
+      "Phalcon\\Test\\Controllers\\": "tests/_data/fixtures/controllers/",
+      "Phalcon\\Test\\Fixtures\\": "tests/_data/fixtures/",
+      "Phalcon\\Test\\Models\\": "tests/_data/fixtures/models/",
+      "Phalcon\\Test\\Module\\": "tests/_support/Module/",
+      "Phalcon\\Test\\Listener\\": "tests/_data/listener/",
+      "Phalcon\\Test\\Db\\": "tests/_data/db/"
     }
+  },
+  "support": {
+    "email": "[email protected]",
+    "issues": "https://github.com/phalcon/cphalcon/issues",
+    "forum": "https://phalcon.link/forum/",
+    "source": "https://github.com/phalcon/cphalcon",
+    "docs": "https://phalcon.link/docs/",
+    "rss": "https://blog.phalcon.io/rss"
+  }
 }