Merge 0ebb1d1 into daaf78a

.gitignore

@@ -5,4 +5,5 @@ vendor
 build/*
 phpDocumentor.phar
 docs
-.vscode
+.vscode
+composer.lock

.php_cs.dist

@@ -1,5 +1,14 @@
 <?php
 
+$header = <<<EOF
+This file is part of the Divergence package.
+
+(c) Henry Paradiz <henry.paradiz@gmail.com>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+EOF;
+
 $finder = PhpCsFixer\Finder::create()
     //->exclude('somedir')
     ->in(__DIR__)
@@ -11,12 +20,20 @@ return PhpCsFixer\Config::create()
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
         'trailing_comma_in_multiline_array' => true,
+        'no_trailing_comma_in_singleline_array' => true,
         'ternary_operator_spaces' => true,
         'trim_array_spaces' => true,
         'ordered_imports' => [
             'sortAlgorithm' => 'length'
         ],
-        'ordered_class_elements' => true
+        'ordered_class_elements' => true,
+        'indentation_type' => true,
+        'header_comment' => [
+            'header' => $header,
+            'comment_type' => 'PHPDoc',
+            'location' => 'after_open',
+            'separate' => 'none',
+        ]
     ])
-    ->setFinder($finder)
+    ->setFinder($finder)   
 ;

.travis.yml

@@ -1,12 +1,14 @@
 language: php
 php:
-  - '7.1'
-  - '7.2'
+  - '7.4'
+
+services:
+  - mysql
 
 addons:
   apt:
-    sources:
-      - mysql-5.7-trusty
+    #sources:
+    #  - mysql-5.7-trusty
     packages:
       - mysql-server
       - mysql-client
@@ -19,7 +21,7 @@ before_install:
 
 install:
     # Install composer packages
-  - travis_retry composer update --no-interaction --no-suggest
+  #- travis_retry composer update --no-interaction --no-suggest
   - travis_retry composer install --no-interaction --no-suggest
   # Install coveralls.phar
   - wget -c -nc --retry-connrefused --tries=0 https://github.com/php-coveralls/php-coveralls/releases/download/v2.0.0/php-coveralls.phar -O coveralls.phar
@@ -39,9 +41,9 @@ after_success:
 # Submit coverage report to codecov.io
  - bash <(curl -s https://codecov.io/bash)
 
- # Tell Travis CI to monitor only 'master' branch
-branches:
-  only: master
+ # Tell Travis CI to monitor only 'release' branch
+#branches:
+#  only: release
 
 # Specify where the cache is so you can delete it via the travis-ci web interface
 cache:

bootstrap/app.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * This file is part of the Divergence package.
+ *
+ * (c) Henry Paradiz <henry.paradiz@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 use Divergence\App as App;
 
-App::init(realpath(__DIR__.'/../'));
+$app = new App(realpath(__DIR__.'/../'));

bootstrap/autoload.php

@@ -1,3 +1,11 @@
 <?php
+/**
+ * This file is part of the Divergence package.
+ *
+ * (c) Henry Paradiz <henry.paradiz@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 define('DIVERGENCE_START', microtime(true));
 require(__DIR__.'/../vendor/autoload.php');

bootstrap/router.php

@@ -1,2 +1,10 @@
 <?php
-Divergence\Controllers\SiteRequestHandler::handleRequest();
+/**
+ * This file is part of the Divergence package.
+ *
+ * (c) Henry Paradiz <henry.paradiz@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+$app->handleRequest();

composer.json

@@ -13,10 +13,14 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
-        "dwoo/dwoo": "1.3.6",
+        "php": ">=7.4",
+        "twig/twig": "*",
         "filp/whoops": "*",
-        "symfony/var-dumper": "^3.0"
+        "symfony/var-dumper": "^4.0",
+        "psr/http-server-handler": "^1.0",
+        "psr/http-message": "^1.0",
+        "guzzlehttp/psr7": "^1.6",
+        "twig/extra-bundle": "^3.0"
     },
     "autoload": {
 	    "psr-4": {
@@ -32,8 +36,8 @@
     "require-dev": {
         "phpunit/phpunit": "^7.0",
         "friendsofphp/php-cs-fixer": "*",
-        "mikey179/vfsStream": "1.6.5",
-        "fzaninotto/faker": "1.7.1"
+        "mikey179/vfsstream": "^1.6",
+        "fzaninotto/faker": "^1.9"
     },
     "suggest": {
         "divergence/cli": "Lets you initialize a new project as well as create, edit, and test database configurations via CLI."