Merge pull request #1358 from phalcon/feature/#1248-box-3-upgrade

#1248 - Box 3 upgrade

Author: Jeckerson

.ci/build-phar.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# This file is part of the Phalcon Framework.
+#
+# (c) Phalcon Team <team@phalcon.io>
+#
+# For the full copyright and license information, please view the
+# LICENSE.txt file that was distributed with this source code.
+
+set -eu
+
+if [ "$(command -v box 2>/dev/null || true)" = "" ]; then
+  (>&2 printf "To use this script you need to install humbug/box: %s \\n" \
+    "https://github.com/humbug/box")
+  (>&2 echo "Aborting.")
+  exit 1
+fi
+
+box validate
+box compile
+
+if [ ! -f "./phalcon.phar" ] || [ ! -x "./phalcon.phar" ]; then
+  (>&2 echo "Something went wrong when building zephir.phar")
+  (>&2 echo "Aborting.")
+  exit 1
+fi

.ci/install-box.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# This file is part of the Phalcon Framework.
+#
+# (c) Phalcon Team <team@phalcon.io>
+#
+# For the full copyright and license information, please view the
+# LICENSE.txt file that was distributed with this source code.
+
+set -e
+
+: "${BOX_VERSION:=3.8.3}"
+
+wget "https://github.com/humbug/box/releases/download/${BOX_VERSION}/box.phar" \
+    --quiet \
+    -O "${HOME}/bin/box"
+
+chmod +x "${HOME}/bin/box"
+box --version

.travis.yml

@@ -7,9 +7,13 @@ services:
 matrix:
   include:
     - php: 7.2
-      env: ZEND_BACKEND="--backend=ZendEngine3"
+      env:
+        - BUILD_PHAR=1
+        - ZEND_BACKEND="--backend=ZendEngine3"
     - php: 7.3
-      env: ZEND_BACKEND="--backend=ZendEngine3"
+      env:
+        - BUILD_PHAR=0
+        - ZEND_BACKEND="--backend=ZendEngine3"
 
 git:
   depth: 1
@@ -27,13 +31,15 @@ cache:
 
 env:
   global:
+    - BUILD_PHAR=1
     - PATH="$PATH:~/bin"
     - DISPLAY=":99.0"
+    - PHAR_PHP_VERSION=7.2.23
+    - BOX_VERSION=3.8.3
     - PHALCON_VERSION=v4.0.0-rc.2
 
 before_install:
   - export PHP_VERSION=$(php-config --version)
-  - export PHP_MAJOR="$(echo $TRAVIS_PHP_VERSION | cut -d '.' -f 1)"
   - export PHP_EXTENSION_DIR=$(php-config --extension-dir)
   - source $TRAVIS_BUILD_DIR/tests/_ci/environment
   - export $(cut -d= -f1 $TRAVIS_BUILD_DIR/tests/_ci/environment)
@@ -44,6 +50,14 @@ before_install:
 install:
   - pecl install --force psr
   - .ci/install-phalcon.sh
+  - |
+    if [ "$BUILD_PHAR" -eq 1 ]
+    then
+      echo "Build Phalcon DevTools PHAR"
+      composer config platform.php $PHAR_PHP_VERSION
+      .ci/install-box.sh
+      .ci/build-phar.sh
+    fi
 
 before_script:
   - travis_retry composer install --no-interaction --no-ansi --no-progress --no-suggest
@@ -59,3 +73,13 @@ script:
   - vendor/bin/codecept run console -v
   - vendor/bin/psalm --show-info=false
   - vendor/bin/phpstan analyse -l 5 -c phpstan.neon src -v
+
+deploy:
+  provider: releases
+  api_key: $GITHUB_TOKEN
+  file: phalcon.phar
+  skip_cleanup: true
+  on:
+    php: '7.2'
+    tags: true
+  repo: phalcon/phalcon-devtools

bootstrap/autoload.php

@@ -37,7 +37,8 @@
 /**
  * Check for old versions
  */
-if (rtrim(strtolower(realpath(PTOOLSPATH)), '\\/') !== rtrim(strtolower(realpath(dirname(dirname(__FILE__)))), '\\/')) {
+$currentPath = realpath(dirname(dirname(__FILE__)));
+if ($currentPath !== false && rtrim(strtolower(realpath(PTOOLSPATH)), '\\/') !== rtrim(strtolower($currentPath), '\\/')) {
     throw new Exception(
         sprintf(
             'The environment variable PTOOLSPATH is outdated! Current value: %s. New value: %s',

box.json

@@ -1,35 +1,31 @@
 {
-  "main": "phalcon",
-  "output": "phalcon.phar",
-  "chmod": "0755",
-  "directories": [
-    "bootstrap",
-    "resources",
-    "src",
-    "templates"
-  ],
-  "files": [
-    "webtools.php",
-    "LICENSE.txt"
-  ],
-  "finder": [
-    {
-      "in": "resources",
-      "name": "*.*"
-    },
-    {
-      "in": "src",
-      "name": "*.*"
-    },
-    {
-      "in": "templates",
-      "ignoreDotFiles": false,
-      "name": [
-        "*.*",
-        ".htrouter.php"
-      ]
-    }
-  ],
-  "git-version": "git_tag",
-  "stub": true
+    "directories": [
+        "bootstrap",
+        "resources",
+        "src",
+        "templates"
+    ],
+    "files": [
+        "webtools.php",
+        "LICENSE.txt"
+    ],
+    "finder": [
+        {
+            "in": "resources",
+            "name": "*.*"
+        },
+        {
+            "in": "src",
+            "name": "*.*"
+        },
+        {
+            "in": "templates",
+            "ignoreDotFiles": false,
+            "name": [
+                "*.*",
+                ".htrouter.php"
+            ]
+        }
+    ],
+    "git-version": "git_tag"
 }

composer.json

@@ -31,7 +31,7 @@
         "phalcon/migrations": "^1.0"
     },
     "require-dev": {
-        "kherge/box": "^2.7",
+        "humbug/box": "^3.8",
         "codeception/codeception": "^3.1",
         "phpdocumentor/reflection-docblock": "^4.3",
         "phpunit/phpunit": "^8.0",