Merge branch 'release-4.0.0-alpha.1'

.editorconfig

@@ -0,0 +1,12 @@
+; top-most EditorConfig file
+root = true
+
+; Unix-style newlines
+[*]
+end_of_line = lf
+
+[*.php]
+indent_style = tab
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitattributes

@@ -15,6 +15,7 @@ phpdoc.dist.xml export-ignore
 readme.rst
 
 # They don't want all of our tests...
+tests/bin/ export-ignore
 tests/codeigniter/ export-ignore
 tests/travis/ export-ignore
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+---
+name: Bug report
+about: Help us improve the framework by reporting bugs!
+
+---
+
+**Direction**
+We use github issues to track bugs, not for support.  
+If you have a support question, or a feature request, raise these as threads on our
+[forum](https://forum.codeigniter.com/index.php).
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**CodeIgniter 4 version**
+Which version (and branch, if applicable) the bug is in.
+
+**Affected module(s)**
+Which package or class is the bug in, if known.
+
+**Expected behavior, and steps to reproduce if appropriate**
+A clear and concise description of what you expected to happen,
+and how you got there.  
+Feel free to include a text/log extract, but use a pastebin facility for any
+screenshots you deem necessary.
+
+**Context**
+ - OS: [e.g. Windows 99]
+ - Web server [e.g. Apache 1.2.3]
+ - PHP version [e.g. 6.5.4]

.gitignore

@@ -42,7 +42,9 @@ $RECYCLE.BIN/
 # These should never be under version control,
 # as it poses a security risk.
 .env
+.vagrant
 application/.env
+Vagrantfile
 
 #-------------------------
 # Temporary Files
@@ -55,10 +57,20 @@ writable/logs/*
 !writable/logs/index.html
 !writable/logs/.htaccess
 
+writable/session/*
+!writable/session/index.html
+!writable/session/.htaccess
+
 writable/uploads/*
 !writable/uploads/index.html
 !writable/uploads/.htaccess
 
+writable/debugbar/*
+
+application/Database/Migrations/2*
+
+php_errors.log
+
 #-------------------------
 # User Guide Temp Files
 #-------------------------
@@ -88,6 +100,9 @@ composer.lock
 # Modules Testing
 _modules/*
 
+# phpenv local config
+.php-version
+
 # Jetbrains editors (PHPStorm, etc)
 .idea/
 *.iml
@@ -102,10 +117,18 @@ nbactions.xml
 nb-configuration.xml
 .nb-gradle/
 
-## Sublime Text
+# Sublime Text
 *.tmlanguage.cache
 *.tmPreferences.cache
 *.stTheme.cache
 *.sublime-workspace
 *.sublime-project
-/api/
+.phpintel
+/api/
+
+# Visual Studio Code
+.vscode/
+
+/results/
+/phpunit*.xml
+

.travis.yml

@@ -1,22 +1,46 @@
 language: php
 
 php:
-  - 7
+  - 7.1
+  - 7.2
+  - nightly
 
-env:
-  - DB_GROUP=mysqli
-  - DB_GROUP=postgres
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: nightly
 
-script:
-  - php vendor/bin/phpunit -v
+global:
+  - CI=true
+  - CI_ENVIRONMENT=testing
+
+# Recommended by Travis support
+sudo: required
+dist: precise
+
+env:
+  - DB=mysqli
+  - DB=postgres
+  - DB=sqlite
 
 services:
+  - memcached
   - mysql
   - postgresql
+  - redis-server
+
+script:
+  - php vendor/bin/phpunit -v
 
 before_install:
-  - if [ $DB_GROUP = 'mysqli' ]; then mysql -e "create database IF NOT EXISTS test;" -uroot; fi
-  - if [ $DB_GROUP = 'postgres' ]; then psql -c 'create database test;' -U postgres; fi
+  - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot;
+  - mysql -e "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'test';" -uroot
+  - psql -c 'CREATE DATABASE test;' -U postgres
 
 before_script:
-  - composer install
+  - echo 'extension = memcached.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - composer install --prefer-source
+
+after_success:
+  - travis_retry php tests/bin/php-coveralls.phar -v

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,22 @@
+Each pull request should address a single issue, and have a meaningful title.
+
+**Description**
+Explain what you have changed, and why.
+
+**Checklist:**
+- [ ] Securely signed commits
+- [ ] Component(s) with PHPdocs
+- [ ] Unit testing, with >80% coverage
+- [ ] User guide updated
+- [ ] Conforms to style guide
+
+---------Remove from here down in your description----------
+
+**Notes**
+- Pull requests must be in English
+- If the PR solves an issue, reference it with a suitable verb and the issue number
+(e.g. fixes <hash>12345
+- Unsolicited PRs will be considered, but there is no guarantee of acceptance
+- Pull requests should be from a feature branch in the contributor's fork of the repository
+  to the develop branch of the project repository
+

README.md

@@ -1,8 +1,8 @@
 # CodeIgniter 4 Development
 
-[![Build Status](https://travis-ci.org/lonnieezell/CodeIgniter4.svg?branch=develop)](https://travis-ci.org/lonnieezell/CodeIgniter4)
+[![Build Status](https://travis-ci.org/bcit-ci/CodeIgniter4.svg?branch=develop)](https://travis-ci.org/bcit-ci/CodeIgniter4)
+[![Coverage Status](https://coveralls.io/repos/github/bcit-ci/CodeIgniter4/badge.svg?branch=develop)](https://coveralls.io/github/bcit-ci/CodeIgniter4?branch=develop)
 <br>
-[![StyleCI](https://styleci.io/repos/41463886/shield)](https://styleci.io/repos/41463886)	
 
 ## What is CodeIgniter?
 CodeIgniter is a PHP full-stack web framework that is light, fast, flexible, and secure. 
@@ -16,6 +16,22 @@ while still keeping as many of the things intact that has made people love the f
 
 More information about the plans for version 4 can be found in [the announcement](http://forum.codeigniter.com/thread-62615.html) on the forums.
 
+### Documentation
+
+The current documentation can be found [here](https://bcit-ci.github.io/CodeIgniter4/). As with the rest of the framework, it is currently a work in progress, and will see changes over time to structure, explanations, etc.
+
+## Important Change with index.php
+
+index.php is no longer in the root of the project! It has been moved inside the *public* folder,
+for better security and separation of components.
+
+This means that you should configure your web server to "point" to your project's *public* folder, and
+not to the project root. A better practice would be to configure a virtual host to point there. A poor practice would be to point your web server to the project root and expect to enter *public/...*, as the rest of your logic and the
+framework are exposed.
+
+**Please** read the user guide for a better explanation of how CI4 works!
+The user guide updating and deployment is a bit awkward at the moment, but we are working on it!
+
 ## Repository Management
 We use Github issues to track **BUGS** and to track approved **DEVELOPMENT** work packages.
 We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
@@ -39,14 +55,21 @@ Remember that some components that were part of CodeIgniter 3 are being moved
 to optional packages, with their own repository.
 
 ## Contributing
-We are not accepting contributions from the public until a stable enough base has been formed, 
-and our plans fleshed out and things settle down a little bit. 
-At that point, we will welcome your comments and help creating the best framework for our community.
+We **are** accepting contributions from the community, specifically those identified as part of phase 2.
+
+We will try to manage the process somewhat, by adding a "Help wanted" label to those that we are 
+specifically interested in at any point in time. Join the discussion for those issues, and let us know 
+if you want to take the lead for one of them.
+
+We are not looking for out-of-scope contributions, only those that would be considered part of our controlled evolution!
 
-Please read the *Contributing to CodeIgniter* section in the user guide
+Please read the [*Contributing to CodeIgniter*](https://github.com/bcit-ci/CodeIgniter4/blob/develop/contributing.md) section in the user guide
 
 ## Server Requirements
-PHP version 7 or higher is required. 
+PHP version 7.1 or higher is required, with the following extensions installed: 
+
+- intl
+
 
 ## Running CodeIgniter Tests
-Information on running CodeIgniter test suite can be found in the README.md file in the tests directory.
+Information on running CodeIgniter test suite can be found in the [README.md](tests/README.md) file in the tests directory.

admin/README.md

@@ -0,0 +1,6 @@
+# CodeIgniter 4 Admin
+
+This folder contains tools or docs useful for project maintainers.
+
+- [docbot](./docbot.md) - build & deploy user guide
+- [release](./release.md) - build & deploy framework release