Merge pull request #19 from Divergence/develop

Version 2.0 - PHP 8.0 Support

Author: hparadiz

.gitignore

@@ -1,9 +1,11 @@
 .php_cs.cache
+.php-cs-fixer.cache
 vendor
 .debug
 .dev
 build/*
 phpDocumentor.phar
 docs
 .vscode
-composer.lock
+composer.lock
+.phpunit.result.cache

.php_cs.dist .php_cs.dist.php.php_cs.dist renamed to .php_cs.dist.php

@@ -9,12 +9,12 @@
 file that was distributed with this source code.
 EOF;
 
-$finder = PhpCsFixer\Finder::create()
+$finder = (new PhpCsFixer\Finder())
     //->exclude('somedir')
     ->in(__DIR__)
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR1' => true,
         '@PSR2' => true,

.scrutinizer.yml

@@ -0,0 +1,36 @@
+checks:
+  php:
+    code_rating: true
+    duplication: true
+
+build:
+  image: default-bionic
+  environment:
+    php: 8.1.12
+    variables:
+      XDEBUG_MODE: 'coverage'
+  nodes:
+    coverage:
+      services:
+        mariadb:
+            image: docker.io/library/mariadb:10.6.12
+            env:
+              MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
+            ports:
+                - 3306
+            ramdisks:
+                - /var/run/mysqld
+      dependencies:
+        before:
+          - mysql -u root -e "CREATE DATABASE IF NOT EXISTS test CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
+      tests:
+        override:
+          - command: ./vendor/bin/phpunit --coverage-clover=build/coverage/clover.xml  # Or "./vendor/bin/phpunit --coverage-clover=build/coverage/clover.xml"
+            idle_timeout: 300
+            coverage:
+              file: 'build/coverage/clover.xml'
+              format: 'php-clover'
+    analysis:
+      tests:
+        override:
+        - php-scrutinizer-run

.travis.yml

@@ -1,6 +1,6 @@
 language: php
 php:
-  - '7.4'
+  - '8.1'
 
 services:
   - mysql

composer.json

@@ -10,10 +10,15 @@
             "email": "henry.paradiz@gmail.com",
             "homepage": "https://henryparadiz.com",
             "role": "Developer"
+        },
+        {
+            "name": "Jack Smith",
+            "email": "jgs41495@gmail.com",
+            "role": "Developer"
         }
     ],
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.1",
         "twig/twig": "*",
         "filp/whoops": "*",
         "symfony/var-dumper": "^4.0",
@@ -34,10 +39,11 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0",
+        "phpunit/phpunit": "^9.5",
         "friendsofphp/php-cs-fixer": "*",
         "mikey179/vfsstream": "^1.6",
-        "fzaninotto/faker": "^1.9"
+        "fakerphp/faker": "^1.20",
+        "dms/phpunit-arraysubset-asserts": "^0.4.0"
     },
     "suggest": {
         "divergence/cli": "Lets you initialize a new project as well as create, edit, and test database configurations via CLI."

config/app.php

@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-use \Divergence\App as App;
+use Divergence\App as App;
 
 return [
     'debug'			=>	file_exists(App::$App->ApplicationPath . '/.debug'),

config/db.php

@@ -39,17 +39,17 @@
      *
      */
     'tests-mysql' => [
-        'host'     =>   'localhost',
+        'host'     =>   '127.0.0.1',
         'database' =>  'test',
-        'username' =>  'travis',
+        'username' =>  'root',
         'password' =>  '',
     ],
     'tests-mysql-socket' => [
         // the first is for travis ci and default-ish linux, the second is for my dev machine using osx.
         // feel free to adjust for yourself but do not commit your preference
         'socket'   => file_exists('/var/run/mysqld/mysqld.sock') ? '/var/run/mysqld/mysqld.sock' : '/tmp/mysql.sock',
         'database' =>  'test',
-        'username' =>  'travis',
+        'username' =>  'root',
         'password' =>  '',
     ],
 ];

phpunit.xml

@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         verbose="true"
-         colors="true"
-         bootstrap="vendor/autoload.php">
-    <testsuites>
-        <testsuite name="all">
-            <directory>tests/Divergence</directory>
-        </testsuite>
-    </testsuites>
-    <listeners>
-        <listener class="Divergence\Tests\TestListener" file="./tests/Divergence/TestListener.php"></listener>
-    </listeners>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-            <exclude>
-                <directory>./src/App</directory>
-                <directory>./public</directory>
-                <directory>./vendor</directory>
-                <directory>./tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <php>
-        <const name="PHPUNIT_TESTSUITE" value="true"/>
-    </php>
-</phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" verbose="true" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+    <exclude>
+      <directory>./src/App</directory>
+      <directory>./public</directory>
+      <directory>./vendor</directory>
+      <directory>./tests</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="all">
+      <directory>tests/Divergence</directory>
+    </testsuite>
+  </testsuites>
+  <listeners>
+    <listener class="Divergence\Tests\TestListener" file="./tests/Divergence/TestListener.php"/>
+  </listeners>
+  <php>
+    <const name="PHPUNIT_TESTSUITE" value="true"/>
+  </php>
+</phpunit>

readme.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/Divergence/framework.svg?branch=release)](https://travis-ci.org/Divergence/framework) [![Coverage Status](https://coveralls.io/repos/github/Divergence/framework/badge.svg?branch=release)](https://coveralls.io/github/Divergence/framework?branch=release) [![codecov](https://codecov.io/gh/Divergence/framework/branch/release/graph/badge.svg)](https://codecov.io/gh/Divergence/framework) [![Latest Stable Version](https://poser.pugx.org/divergence/divergence/downloads)](https://packagist.org/packages/divergence/divergence) [![Latest Unstable Version](https://poser.pugx.org/divergence/divergence/v/stable)](https://packagist.org/packages/divergence/divergence) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Divergence/framework/badges/quality-score.png?b=release)](https://scrutinizer-ci.com/g/Divergence/framework/?branch=release) [![License](https://poser.pugx.org/divergence/divergence/license)](https://packagist.org/packages/divergence/divergence)
+[![Code Coverage](https://scrutinizer-ci.com/g/Divergence/framework/badges/coverage.png?b=develop)](https://scrutinizer-ci.com/g/Divergence/framework/?branch=develop) [![Latest Stable Version](https://poser.pugx.org/divergence/divergence/downloads)](https://packagist.org/packages/divergence/divergence) [![Build Status](https://scrutinizer-ci.com/g/Divergence/framework/badges/build.png?b=develop)](https://scrutinizer-ci.com/g/Divergence/framework/build-status/develop) [![Latest Unstable Version](https://poser.pugx.org/divergence/divergence/v/stable)](https://packagist.org/packages/divergence/divergence) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Divergence/framework/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/Divergence/framework/?branch=release) [![License](https://poser.pugx.org/divergence/divergence/license)](https://packagist.org/packages/divergence/divergence)
 
 ---
 Divergence is a PHP framework designed for rapid development and modern practices without becoming an over abstracted mess.
@@ -16,22 +16,19 @@ Unit testing the code base and providing code coverage is a primary goal of this
 # Main Features
  * Models
     * Real PHP classes.
-    * Extend an `ActiveRecord` class.
-    * Use `traits` to unlock Relationships and Versioning as needed.
-    * Automatically creates table on first time use.
+    * Map fields with array or attributes.
+    * Built in support for relationships and object versioning.
+    * Speed up prototyping and automate new deployments by automatically creates table based on your models when none are found.
     * Built in support for MySQL.
 
- * Database
-    * Use the existing DB class or access PDO directly by calling `DB::getConnection()`.
-
  * Routing
     * Simpler, faster, tree based routing system.
     * Built with basic class inheritance in mind.
 
 * Controllers
     * Psr7 compatible controllers.
     * Pre-made REST API controllers allow you to build APIs rapidly.
-    * 100% Unit test coverage for filters, sorters, and conditions go ive you peace of mind.
+    * 100% Unit test coverage for filters, sorters, and conditions.
     * Build HTTP APIs in minutes by extending `RecordsRequestHandler` and setting the one config variable: the name of your model class.
     * Use a pre-made security trait with RecordsRequestHandler or extend it and write in your own permissions.
     * Standard permissions interface allows reuse of permission traits from one model to another.

src/App.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Divergence;
 
 use Divergence\Routing\Path;
@@ -17,7 +18,7 @@
 
 class App
 {
-    const VERSION = '1.1';
+    public const VERSION = '1.1';
     public $ApplicationPath;
     public $Config;
     public Path $Path;
@@ -34,7 +35,9 @@ public function init($Path)
     {
         $this->ApplicationPath = $Path;
 
-        $this->Path = new Path($_SERVER['REQUEST_URI']);
+        if (php_sapi_name()!=='cli') {
+            $this->Path = new Path($_SERVER['REQUEST_URI']);
+        }
 
         $this->Config = $this->config('app');
 
@@ -61,7 +64,7 @@ public function registerErrorHandler()
     {
         // only show errors in dev environment
         if ($this->Config['environment'] == 'dev') {
-            $this->whoops = new \Whoops\Run;
+            $this->whoops = new \Whoops\Run();
 
             $Handler = new \Whoops\Handler\PrettyPageHandler();
             $Handler->setPageTitle("Divergence Error");