Merge pull request #6 from tattersoftware/tools

Migration Standards

.github/workflows/analyze.yml

@@ -39,7 +39,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: composer, pecl, phpunit
-          extensions: intl, json, mbstring, mysqlnd, xdebug, xml, sqlite3
+          extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3
 
       - name: Get composer cache directory
         id: composer-cache

.github/workflows/test.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: composer, pecl, phpunit
-          extensions: intl, json, mbstring, mysqlnd, xdebug, xml, sqlite3
+          extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3
           coverage: xdebug
 
       - name: Get composer cache directory

README.md

@@ -31,7 +31,7 @@ to ensure the database is setup correctly:
 ## Configuration (optional)
 
 The library's default behavior can be altered by extending its config file. Copy
-**bin/Visits.php** to **app/Config/** and follow the instructions in the
+**examples/Visits.php** to **app/Config/** and follow the instructions in the
 comments. If no config file is found in app/Config the library will use its own.
 
 ## Usage

composer.json

@@ -24,7 +24,7 @@
 	},
 	"require-dev": {
 		"codeigniter4/codeigniter4": "dev-develop",
-		"tatter/tools": "^1.6"
+		"tatter/tools": "^1.7"
 	},
 	"autoload": {
 		"psr-4": {

phpstan.neon.dist

@@ -13,7 +13,6 @@ parameters:
 		- '#Access to protected property .+\\[A-Za-z]+Model::\$[A-Za-z]+#'
 		- '#Access to an undefined property CodeIgniter\\Session\\Session::\$session_id#'
 		- '#Call to an undefined static method Config\\Services::[A-Za-z]+\(\)#'
-		- '#Unsafe usage of new static\(\)*#'
 	universalObjectCratesClasses:
 		- CodeIgniter\Entity
 		- Faker\Generator

phpunit.xml.dist

@@ -36,6 +36,10 @@
 		</testsuite>
 	</testsuites>
 
+	<listeners>
+		<listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener" />
+	</listeners>
+
 	<logging>
 		<testdoxHtml outputFile="build/phpunit/testdox.html"/>
 		<testdoxText outputFile="build/phpunit/testdox.txt"/>

src/Database/Migrations/20190319121802_create_table_visits.php

@@ -7,21 +7,21 @@ class Migration_create_table_visits extends Migration
 	public function up()
 	{
 		$fields = [
-			'session_id'   => ['type' => 'VARCHAR', 'constraint' => 32],
-			'user_id'      => ['type' => 'INT', 'null' => true],
-			'ip_address'   => ['type' => 'BIGINT', 'null' => true],
-			'user_agent'   => ['type' => 'VARCHAR', 'constraint' => 255],
-			'scheme'       => ['type' => 'VARCHAR', 'constraint' => 15],
-			'host'         => ['type' => 'VARCHAR', 'constraint' => 63],
-			'port'         => ['type' => 'VARCHAR', 'constraint' => 15],
-			'user'         => ['type' => 'VARCHAR', 'constraint' => 31],
-			'pass'         => ['type' => 'VARCHAR', 'constraint' => 255],
-			'path'         => ['type' => 'VARCHAR', 'constraint' => 255],
-			'query'        => ['type' => 'VARCHAR', 'constraint' => 255],
-			'fragment'     => ['type' => 'VARCHAR', 'constraint' => 31],
-			'views'        => ['type' => 'INT', 'default' => 1],
-			'created_at'   => ['type' => 'DATETIME', 'null' => true],
-			'updated_at'   => ['type' => 'DATETIME', 'null' => true],
+			'session_id'   => ['type' => 'varchar', 'constraint' => 32, 'default' => ''],
+			'user_id'      => ['type' => 'int', 'null' => true],
+			'ip_address'   => ['type' => 'bigint', 'null' => true],
+			'user_agent'   => ['type' => 'varchar', 'constraint' => 255, 'default' => ''],
+			'scheme'       => ['type' => 'varchar', 'constraint' => 15, 'default' => ''],
+			'host'         => ['type' => 'varchar', 'constraint' => 63],
+			'port'         => ['type' => 'varchar', 'constraint' => 15, 'default' => ''],
+			'user'         => ['type' => 'varchar', 'constraint' => 31, 'default' => ''],
+			'pass'         => ['type' => 'varchar', 'constraint' => 255, 'default' => ''],
+			'path'         => ['type' => 'varchar', 'constraint' => 255],
+			'query'        => ['type' => 'varchar', 'constraint' => 255, 'default' => ''],
+			'fragment'     => ['type' => 'varchar', 'constraint' => 31, 'default' => ''],
+			'views'        => ['type' => 'int', 'default' => 1],
+			'created_at'   => ['type' => 'datetime', 'null' => true],
+			'updated_at'   => ['type' => 'datetime', 'null' => true],
 		];
 
 		$this->forge->addField('id');

src/Models/VisitModel.php

@@ -6,9 +6,11 @@ class VisitModel extends Model
 {
 	protected $table      = 'visits';
 	protected $primaryKey = 'id';
+	protected $returnType = 'Tatter\Visits\Entities\Visit';
 
-	protected $returnType     = 'Tatter\Visits\Entities\Visit';
+	protected $useTimestamps  = true;
 	protected $useSoftDeletes = false;
+	protected $skipValidation = false;
 
 	protected $allowedFields = [
 		'session_id',
@@ -26,13 +28,8 @@ class VisitModel extends Model
 		'fragment',
 	];
 
-	protected $useTimestamps = true;
-
-	protected $validationRules    = [
+	protected $validationRules = [
 		'host' => 'required',
 		'path' => 'required',
 	];
-	protected $validationMessages = [];
-	protected $skipValidation     = false;
-
 }