Merge pull request #1227 from phalcon/3.4.x

3.4.0

Author: sergeyklay

.travis.yml

@@ -6,7 +6,6 @@ dist: trusty
 php:
   - 5.5
   - 5.6
-  - 7.1
 
 services:
   - postgresql
@@ -15,6 +14,10 @@ matrix:
   include:
     - php: 7.0
       env: ZEND_BACKEND="--backend=ZendEngine3"
+    - php: 7.1
+      env: ZEND_BACKEND="--backend=ZendEngine3"
+    - php: 7.2
+      env: ZEND_BACKEND="--backend=ZendEngine3"
 
 git:
   depth: 1
@@ -28,41 +31,30 @@ cache:
     - vendor
     - $HOME/.ccache
     - $HOME/.composer/cache
-    - $HOME/cphalcon
-    - $HOME/ext
+    - $HOME/cphalcon/$PHALCON_VERSION
+    - $HOME/ext/$PHALCON_VERSION
 
 env:
   global:
-    - TEST_DB_POSTGRESQL_HOST="127.0.0.1"
-    - TEST_DB_POSTGRESQL_PORT="5432"
-    - TEST_DB_POSTGRESQL_USER="postgres"
-    - TEST_DB_POSTGRESQL_PASSWD=""
-    - TEST_DB_POSTGRESQL_NAME="devtools"
-    - TEST_DB_POSTGRESQL_SCHEMA="public"
-    - TEST_DB_MYSQL_DSN="mysql:host=127.0.0.1;dbname=devtools"
-    - TEST_DB_MYSQL_HOST="127.0.0.1"
-    - TEST_DB_MYSQL_PORT="3306"
-    - TEST_DB_MYSQL_USER="root"
-    - TEST_DB_MYSQL_PASSWD=""
-    - TEST_DB_MYSQL_NAME="devtools"
-    - TEST_DB_MYSQL_CHARSET="utf8"
     - PATH="$PATH:~/bin"
     - DISPLAY=":99.0"
-    - PHALCON_VERSION="v3.3.2"
+    - PHALCON_VERSION="v3.4.0"
 
 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)
   - phpenv config-rm xdebug.ini || true
   - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com $GH_TOKEN; fi;
-  - if [ ! -f "$HOME/cphalcon/tests/_ci/phalcon.ini" ]; then git clone -q --depth=1 https://github.com/phalcon/cphalcon.git $HOME/cphalcon >/dev/null 2>&1; fi;
+  - if [ ! -f "$HOME/cphalcon/$PHALCON_VERSION/tests/_ci/phalcon.ini" ]; then git clone -q --depth=1 https://github.com/phalcon/cphalcon.git $HOME/cphalcon/$PHALCON_VERSION >/dev/null 2>&1; fi;
   - bash tests/_ci/setup_dbs.sh
 
 install:
-  - if [ ! -f $HOME/ext/$PHP_VERSION/phalcon.so ]; then cd $HOME/cphalcon/build && bash ./install --phpize $(phpenv which phpize) --php-config $(phpenv which php-config) && mkdir -p $HOME/ext/$PHP_VERSION && cp $PHP_EXTENSION_DIR/phalcon.so $HOME/ext/$PHP_VERSION/phalcon.so; fi;
-  - if [ -f $HOME/ext/$PHP_VERSION/phalcon.so ]; then cp $HOME/ext/$PHP_VERSION/phalcon.so $PHP_EXTENSION_DIR/phalcon.so; fi;
-  - phpenv config-add $HOME/cphalcon/tests/_ci/phalcon.ini
+  - if [ ! -f $HOME/ext/$PHALCON_VERSION/$PHP_VERSION/phalcon.so ]; then cd $HOME/cphalcon/$PHALCON_VERSION/build && bash ./install --phpize $(phpenv which phpize) --php-config $(phpenv which php-config) && mkdir -p $HOME/ext/$PHP_VERSION && cp $PHP_EXTENSION_DIR/phalcon.so $HOME/ext/$PHP_VERSION/phalcon.so; fi;
+  - if [ -f $HOME/ext/$PHALCON_VERSION/$PHP_VERSION/phalcon.so ]; then cp $HOME/ext/$PHALCON_VERSION/$PHP_VERSION/phalcon.so $PHP_EXTENSION_DIR/phalcon.so; fi;
+  - phpenv config-add $HOME/cphalcon/$PHALCON_VERSION/tests/_ci/phalcon.ini
   - cd $TRAVIS_BUILD_DIR
   - travis_retry composer install --prefer-dist --no-interaction
   - if [ "$PHP_MAJOR" == "7" ]; then composer require --dev phpstan/phpstan:^0.9; fi;
@@ -71,6 +63,7 @@ before_script:
   - ln -s $PWD/phalcon.php ~/bin/phalcon
 
 script:
+  - vendor/bin/phpcs
   - vendor/bin/codecept build
   - vendor/bin/codecept run unit -v
   - vendor/bin/codecept run functional -v

CONTRIBUTING.md

@@ -55,11 +55,11 @@ Thanks! <br />
 Phalcon Team
 
 
-[pr]: https://help.github.com/articles/using-pull-requests/
+[pr]: https://help.github.com/articles/about-pull-requests/
 [forum]: https://forum.phalconphp.com/
 [cphalcon]: https://github.com/phalcon/cphalcon
-[srt]: https://github.com/phalcon/cphalcon/wiki/Submit-Reproducible-Test
-[gb]: https://github.com/phalcon/cphalcon/wiki/Generating-a-backtrace
-[support]: https://phalconphp.com/support
-[nfr]: https://github.com/phalcon/cphalcon/wiki/New-Feature-Request---NFR
-[psr]: http://www.php-fig.org/psr/
+[srt]: https://docs.phalconphp.com/en/latest/reproducible-tests
+[gb]: https://docs.phalconphp.com/en/latest/generating-backtrace
+[support]: https://phalconphp.com/en/support/
+[nfr]: https://docs.phalconphp.com/en/latest/new-feature-request
+[psr]: https://www.php-fig.org/psr/

README.md

@@ -4,7 +4,7 @@
 [![Software License](https://img.shields.io/badge/license-BSD--3-brightgreen.svg?style=flat-square)][:license:]
 [![Total Downloads](https://img.shields.io/packagist/dt/phalcon/devtools.svg?style=flat-square)][:packagist:]
 [![Daily Downloads](https://img.shields.io/packagist/dd/phalcon/devtools.svg?style=flat-square)][:packagist:]
-[![Build Status](https://travis-ci.org/phalcon/phalcon-devtools.svg?branch=master)][:travis:]
+[![Build Status](https://api.travis-ci.org/phalcon/phalcon-devtools.svg?branch=master)][:travis:]
 
 ![Phalcon WebTools](https://cloud.githubusercontent.com/assets/1256298/18617851/b7d31558-7de2-11e6-83e0-30e5902af714.png)
 
@@ -21,7 +21,7 @@ with Phalcon framework.
 ## Requirements
 
 * PHP >= 5.5
-* Phalcon >= 3.2.0
+* Phalcon >= 3.3.0
 
 ## Installing via Composer
 
@@ -36,7 +36,7 @@ Create the composer.json file as follows:
 ```json
 {
     "require-dev": {
-        "phalcon/devtools": "~3.2"
+        "phalcon/devtools": "~3.4"
     }
 }
 ```
@@ -114,7 +114,7 @@ This command should display something similar to:
 ```sh
 $ phalcon --help
 
-Phalcon DevTools (3.2.13)
+Phalcon DevTools (3.4.0)
 
 Help:
   Lists the commands available in Phalcon devtools

bootstrap/autoload.php

@@ -4,7 +4,7 @@
   +------------------------------------------------------------------------+
   | Phalcon Developer Tools                                                |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Phalcon Team (https://www.phalconphp.com)      |
+  | Copyright (c) 2011-present Phalcon Team (https://www.phalconphp.com)   |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file LICENSE.txt.                             |
@@ -25,7 +25,7 @@
 if (!extension_loaded('phalcon')) {
     throw new Exception(
         "Phalcon extension isn't installed, follow these instructions to install it: " .
-        'https://docs.phalconphp.com/en/latest/reference/install.html'
+        'https://docs.phalconphp.com/en/latest/installation'
     );
 }
 
@@ -134,6 +134,6 @@
 if (Version::getId() < COMPATIBLE_VERSION) {
     throw new Exception(
         "Your Phalcon version isn't compatible with Developer Tools, " .
-        'download the latest at: https://phalconphp.com/download'
+        'download the latest at: https://phalconphp.com/en/download/linux'
     );
 }

composer.json

@@ -23,8 +23,8 @@
     },
     "require": {
         "php": ">=5.5",
-        "ext-phalcon": "~3.1",
-        "psy/psysh": "^0.9",
+        "ext-phalcon": "~3.3",
+        "psy/psysh": "~0.9",
         "nikic/php-parser": "^3.1"
     },
     "require-dev": {
@@ -33,7 +33,8 @@
         "phpdocumentor/reflection-docblock": "^2.0",
         "phpunit/phpunit": "^4.8",
         "codeception/specify": "^0.4",
-        "codeception/verify": "^0.3"
+        "codeception/verify": "^0.3",
+        "squizlabs/php_codesniffer": "^3.2"
 
     },
     "autoload": {

phpcs.xml.dist

@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<ruleset name="Phalcon Developer Tools">
+
+    <!--
+        The name attribute of the ruleset tag is displayed
+        when running PHP_CodeSniffer with the -v command line
+        argument. The description tag below is not displayed anywhere
+        except in this file, so it can contain information for
+        developers who may change this file in the future.
+    -->
+
+    <description>Phalcon Coding Standards</description>
+
+    <!-- Show sniff codes in all reports -->
+    <arg value="s"/>
+
+    <!-- Use PSR-2 as a base -->
+    <rule ref="PSR2"/>
+
+    <!--
+        If no files or directories are specified on the command line
+        your custom standard can specify what files should be checked
+        instead.
+        Note that specifying any file or directory path
+        on the command line will ignore all file tags.
+    -->
+    <file>scripts</file>
+
+    <exclude-pattern>scripts/Phalcon/Generator/</exclude-pattern>
+    <exclude-pattern>scripts/Phalcon/Devtools/</exclude-pattern>
+
+    <!--
+        You can hard-code ignore patterns directly into your
+        custom standard so you don't have to specify the
+        patterns on the command line.
+    -->
+</ruleset>

resources/bootstrap/fonts/glyphicons-halflings-regular.svg

@@ -1,6 +1,6 @@
 # CodeMirror
-[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
-[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)  
+[![Build Status](https://api.travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
+[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.com/package/codemirror)  
 [Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png?again)](https://marijnhaverbeke.nl/fund/)
 
 CodeMirror is a JavaScript component that provides a code editor in

resources/codemirror/README.md

@@ -13,7 +13,7 @@
 })(function(CodeMirror, diff_match_patch) {
   "use strict";
   var Pos = CodeMirror.Pos;
-  var svgNS = "http://www.w3.org/2000/svg";
+  var svgNS = "https://www.w3.org/2000/svg";
 
   function DiffView(mv, type) {
     this.mv = mv;

resources/codemirror/addon/merge/merge.js

@@ -26,7 +26,7 @@
 <h2>Clojure mode</h2>
 <form><textarea id="code" name="code">
 ; Conway's Game of Life, based on the work of:
-;; Laurent Petit https://gist.github.com/1200343
+;; Laurent Petit https://gist.github.com/laurentpetit/1200343
 ;; Christophe Grand http://clj-me.cgrand.net/2011/08/19/conways-game-of-life
 
 (ns ^{:doc "Conway's Game of Life."}