Merge

.editorconfig

@@ -0,0 +1,18 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.sh]
+indent_style = tab

.env.example

@@ -0,0 +1,29 @@
+APP_DEBUG=true
+APP_ENV=development
+APP_URL=http://docs.phalcon.ld
+APP_NAME="Phalcon Framework"
+APP_PROJECT=Phalcon
+APP_DESCRIPTION="Official Phalcon Documentation"
+APP_KEYWORDS="php, phalcon, phalcon php, php framework, faster php framework, php extension, next generation framework"
+APP_REPO=https://github.com/phalcon/cphalcon
+APP_DOCS=https://github.com/phalcon/docs
+APP_BASE_URI=/
+APP_STATIC_URL=/
+APP_LANG=en
+APP_SUPPORT_EMAIL=team@phalcon.ld
+APP_TIMEZONE=US/Eastern
+
+CACHE_DRIVER=file
+VIEW_CACHE_DRIVER=file
+CACHE_PREFIX=forum_cache_
+CACHE_LIFETIME=86400
+
+MEMCACHED_HOST=127.0.0.1
+MEMCACHED_PORT=11211
+MEMCACHED_WEIGHT=100
+
+LOGGER_DEFAULT_FILENAME=application
+LOGGER_FORMAT='[%date%][%type%] %message%'
+LOGGER_LEVEL=debug
+
+GOOGLE_ANALYTICS=

.gitattributes

@@ -0,0 +1 @@
+*.sql linguist-language=SQL

.gitignore

@@ -1,14 +1,11 @@
-.project
-build
-
-*/_build/
-
-_templates
-*.komodoproject
-*.sublime-*
-.pydevproject
-.idea/
-
-.DS_Store
-
-/nbproject/
+# Please do not use this ignore file to define platform specific files.
+#
+# For these purposes create a global .gitignore file, which is a list of rules
+# for ignoring files in every Git repository on your computer.
+#
+# https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
+
+/vendor
+.env
+/public/robots.txt
+/public/sitemap.xml

.htaccess

@@ -0,0 +1,5 @@
+<IfModule mod_rewrite.c>
+	RewriteEngine on
+	RewriteRule  ^$ public/    [L]
+	RewriteRule  (.*) public/$1 [L]
+</IfModule>

.htrouter.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+  +------------------------------------------------------------------------+
+  | Phosphorum                                                             |
+  +------------------------------------------------------------------------+
+  | Copyright (c) 2013-2017 Phalcon Team and contributors                  |
+  +------------------------------------------------------------------------+
+  | This source file is subject to the New BSD License that is bundled     |
+  | with this package in the file LICENSE.txt.                             |
+  |                                                                        |
+  | If you did not receive a copy of the license and are unable to         |
+  | obtain it through the world-wide-web, please send an email             |
+  | to license@phalconphp.com so we can send you a copy immediately.       |
+  +------------------------------------------------------------------------+
+*/
+
+$uri = urldecode(
+    parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
+);
+
+if ($uri !== '/' && file_exists(__DIR__ . '/public' . $uri)) {
+    return false;
+}
+
+$_GET['_url'] = $_SERVER['REQUEST_URI'];
+
+require_once __DIR__ . '/public/index.php';

.travis.yml

@@ -0,0 +1,91 @@
+language: php
+
+sudo: required
+dist: trusty
+
+php:
+  - 5.6
+
+matrix:
+  include:
+    - php: 7.0
+      env: ZEND_BACKEND="--backend=ZendEngine3"
+
+services:
+  - memcached
+
+git:
+  depth: 1
+
+cache:
+  apt: true
+  ccache: true
+  timeout: 691200
+  directories:
+    - .temp
+    - vendor
+    - $HOME/.ccache
+    - $HOME/.composer/cache
+
+env:
+  global:
+    - ZEND_DONT_UNLOAD_MODULES=1
+    - CC="ccache gcc"
+    - PATH="$PATH:~/bin"
+    - PHALCON_VERSION="v3.0.3"
+
+before_install:
+  - phpenv config-rm xdebug.ini || true
+  - sudo ln -s /home/travis/.phpenv/versions/$(phpenv version-name)/bin/phpize /usr/bin/
+  - sudo ln -s /home/travis/.phpenv/versions/$(phpenv version-name)/bin/php-config /usr/bin/
+  - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
+  - travis_retry composer install --prefer-dist --no-interaction --ignore-platform-reqs
+  - travis_retry composer require --dev "phalcon/zephir:dev-master" --ignore-platform-reqs
+  - ( bash tests/_ci/install_zephir.sh )
+  - ( bash tests/_ci/install_prereqs.sh )
+
+install:
+  - git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b ${PHALCON_VERSION}
+  - ln -s ${TRAVIS_BUILD_DIR}/.temp ${TRAVIS_BUILD_DIR}/cphalcon/.temp
+  - ( cd cphalcon; zephir fullclean && zephir generate $ZEND_BACKEND )
+  - ( cd cphalcon/ext; export CFLAGS="-g3 -O1 -std=gnu90 -Wall -DZEPHIR_RELEASE=1"; /usr/bin/phpize &> /dev/null && ./configure --silent --enable-phalcon &> /dev/null && make --silent -j3 &> /dev/null && make --silent install )
+  - phpenv config-add cphalcon/tests/_ci/phalcon.ini
+
+before_script:
+  # Create database and user
+  - echo 'CREATE DATABASE phosphorum CHARSET=utf8 COLLATE=utf8_unicode_ci' | mysql -u root
+  - echo "CREATE USER 'phosphorum'@'%' IDENTIFIED BY 'secret'" | mysql -u root
+  - echo "GRANT ALL PRIVILEGES ON phosphorum.* TO 'phosphorum'@'%' WITH GRANT OPTION" | mysql -u root
+  - cat schemas/forum.sql | mysql -u root phosphorum
+  - cp ./tests/.env.travis .env
+  - php -S 127.0.0.1:8000 -t public/ .htrouter.php >/dev/null 2>&1 &
+  - sudo ulimit -c unlimited -S || true
+
+script:
+  - vendor/bin/phpcs
+  - vendor/bin/codecept build
+  # Run tests
+  - vendor/bin/codecept run unit
+  - vendor/bin/codecept run functional
+  - vendor/bin/codecept run acceptance
+  - vendor/bin/codecept run console
+
+notifications:
+  email:
+    recipients:
+      - build@phalconphp.com
+    on_success: change
+    on_failure: always
+
+addons:
+  apt:
+    packages:
+      - gdb
+      - re2c
+      - beanstalkd
+      - mysql-server-5.6
+      - mysql-client-core-5.6
+      - mysql-client-5.6
+  hosts:
+    - db
+    - pforum.loc

CONTRIBUTING.md

@@ -1,8 +1,60 @@
-Phalcon is an open source project and a volunteer effort.
+# Contributing Phosphorum
 
-If you have a question about how to use Phalcon, please see the [support page](http://phalconphp.com/support).
+Phosphorum is an open source project and a volunteer effort. Phosphorum welcomes contribution from everyone.
 
-All code snippets must follow the [PSR-2 coding standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md).
+## Contributions
+
+Contributions to Phosphorum should be made in the form of GitHub pull requests.
+Each pull request will be reviewed by a core contributor (someone with permission to land patches) and either landed in
+the main tree or given feedback for changes that would be required before it can be merged. All contributions should
+follow this format, even those from core contributors.
+
+## Questions & Support
+
+_We only accept bug reports, new feature requests and pull requests in GitHub._ For questions regarding the usage of the
+Phosphorum or support requests please visit the [official forums][:forums:].
+
+## Bug Report Checklist
+
+* Make sure you are using the latest released version of Phosphorum before submitting a bug report.
+  Bugs in versions older than the latest released one will not be addressed by the core team
+
+* If you have found a bug it is important to add relevant reproducibility information to your issue to allow us to
+  reproduce the bug and fix it quicker. Add a script, small program or repository providing the necessary code to make
+  everyone reproduce the issue reported easily. If a bug cannot be reproduced by the development it would be difficult
+  provide corrections and solutions
+
+* Be sure that information such as OS, Phalcon Framework and Phosphorum versions and PHP version are part of the
+  bug report
+
+* If you're submitting a Segmentation Fault error, we would require a backtrace, please see
+  [Generating a Backtrace][:bt:]
+
+## Pull Request Checklist
+
+* Don't submit your pull requests to the master branch. Branch from the required branch and, if needed, rebase to the
+  proper branch before submitting your pull request. If it doesn't merge cleanly with master you may be asked to
+  rebase your changes
+
+* Don't put submodule updates, composer.lock, etc in your pull request unless they are to landed commits
+
+* Make sure that the code you write fits with the general style and coding standards of the
+  [Accepted PHP Standards][:psr:]
+
+## Getting Support
+
+If you have a question about how to use Phalcon, please see the [support page][:support:].
+
+## Requesting Features
+
+If you have a change or new feature in mind, please fill an [NFR][:nfr:].
 
 Thanks! <br />
 Phalcon Team
+
+
+[:forums:]: https://forum.phalconphp.com/
+[:bt:]: https://github.com/phalcon/cphalcon/wiki/Generating-a-backtrace
+[:psr:]: http://www.php-fig.org/psr/
+[:support:]: https://phalconphp.com/support
+[:nfr:]: https://github.com/phalcon/cphalcon/wiki/New-Feature-Request---NFR

LICENSE.txt

@@ -0,0 +1,27 @@
+New BSD License
+---------------
+
+Copyright (c) 2012-2017, Phalcon Team (https://www.phalconphp.com)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ * Neither the name of the Phalcon nor the
+   names of its contributors may be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL "PHALCON TEAM" BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,44 +1,3 @@
-# Phalcon Framework Documentation
+### Phalcon Framework - Docs
 
 
-
-## Welcome
-
-This is the repository for the Phalcon documentation. Our documentation is
-hosted on [Read The Docs](http://www.readthedocs.org) which is automatically
-updated when any changes are made to this repository.
-
-You are welcome to fork this repository and add, correct or enhance the
-documentation yourselves.
-
-The documentation is written using [reStructuredText](http://sphinx.pocoo.org/rest.html) and is currently available in 11 different languages:
-
-* [English (en)](https://docs.phalconphp.com/en/latest/index.html)
-* [Chinese / 中文 (zh)](https://docs.phalconphp.com/zh/latest/index.html)
-* [French / français (fr)](https://docs.phalconphp.com/fr/latest/index.html)
-* [Indonesian / Bahasa Indonesia (id)](https://docs.phalconphp.com/id/latest/index.html)
-* [Japanese / 日本語 (ja)](https://docs.phalconphp.com/ja/latest/index.html)
-* [Polish / Polski (pl)](https://docs.phalconphp.com/pl/latest/index.html)
-* [Portuguese / Português (pt)](https://docs.phalconphp.com/pt/latest/index.html)
-* [Russian / Русский (ru)](https://docs.phalconphp.com/ru/latest/index.html)
-* [Spanish / Español (es)](https://docs.phalconphp.com/es/latest/index.html)
-* [Ukranian / Українська (uk)](https://docs.phalconphp.com/uk/latest/index.html)
-* [Farsi(Persian) / ایران (fa)](https://docs.phalconphp.com/fa/latest/index.html)
-
-If you would like to translate the Phalcon Docs into your language, you'll need to find out your language's [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes). For example, to create Vietnamese (vi), run the following command:
-
-    php cli.php language create vi
-
-
-
-## API
-
-The API is automatically generated from the C source code using the following command (replace `/home/sid/cphalcon/ext/` with the appropriate value):
-
-    php cli.php api generate /home/sid/cphalcon/ext/
-
-If you find an error or want to improve it, please send a pull request:
-* Phalcon source code: https://github.com/phalcon/cphalcon
-* Documentation: https://github.com/phalcon/docs
-* Devtools: https://github.com/phalcon/phalcon-devtools
-* Zephir documentation: https://github.com/phalcon/zephir-docs