Release 4.0.0-beta.3

README.md

@@ -31,26 +31,12 @@ The user guide updating and deployment is a bit awkward at the moment, but we ar
 
 ## Repository Management
 
-We use Github issues to track **BUGS** and to track approved **DEVELOPMENT** work packages.
+We use Github issues, in our main repository, to track **BUGS** and to track approved **DEVELOPMENT** work packages.
 We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
 FEATURE REQUESTS.
 
-If you raise an issue here that pertains to support or a feature request, it will
-be closed! If you are not sure if you have found a bug, raise a thread on the forum first -
-someone else may have encountered the same thing.
-
-Before raising a new Github issue, please check that your bug hasn't already
-been reported or fixed. 
-
-We use pull requests (PRs) for CONTRIBUTIONS to the repository.
-We are looking for contributions that address one of the reported bugs or
-approved work packages.
-
-Do not use a PR as a form of feature request.
-Unsolicited contributions will only be considered if they fit nicely
-into the framework roadmap.
-Remember that some components that were part of CodeIgniter 3 are being moved
-to optional packages, with their own repository.
+This repository is a "distribution" one, built by our release preparation script. 
+Problems with it can be raised on our forum, or as issues in the main repository.
 
 ## Contributing
 

_support/Controllers/Popcorn.php

@@ -55,4 +55,23 @@ public function index3()
 		return $response;
 	}
 
+	public function canyon()
+	{
+		echo 'Hello-o-o';
+	}
+
+	public function cat()
+	{
+	}
+
+	public function json()
+	{
+		$this->responsd(['answer' => 42]);
+	}
+
+	public function xml()
+	{
+		$this->respond('<my><pet>cat</pet></my>');
+	}
+
 }

_support/Database/Migrations/20160428212500_Create_test_tables.php

@@ -31,6 +31,14 @@ public function up()
 				'constraint' => 1,
 				'default'    => '0',
 			],
+			'created_at' => [
+				'type'       => 'DATETIME',
+				'null'       => true,
+			],
+			'updated_at' => [
+				'type'       => 'DATETIME',
+				'null'       => true,
+			],
 		]);
 		$this->forge->addKey('id', true);
 		$this->forge->createTable('user', true);
@@ -46,11 +54,25 @@ public function up()
 				'type'       => 'VARCHAR',
 				'constraint' => 40,
 			],
-			'description' => ['type' => 'TEXT'],
-			'created_at'  => [
-				'type' => 'DATETIME',
+			'description' => [
+				'type' => 'TEXT',
 				'null' => true,
 			],
+			'deleted' => [
+				'type'       => 'TINYINT',
+				'constraint' => 1,
+				'default'    => '0',
+			],
+			'created_at' => [
+				'type'       => 'INTEGER',
+				'constraint' => 11,
+				'null'       => true,
+			],
+			'updated_at' => [
+				'type'       => 'INTEGER',
+				'constraint' => 11,
+				'null'       => true,
+			],
 		]);
 		$this->forge->addKey('id', true);
 		$this->forge->createTable('job', true);
@@ -82,6 +104,14 @@ public function up()
 				'type'       => 'VARCHAR',
 				'constraint' => 40,
 			],
+			'created_at' => [
+				'type'       => 'DATE',
+				'null'       => true,
+			],
+			'updated_at' => [
+				'type'       => 'DATE',
+				'null'       => true,
+			],
 		]);
 		$this->forge->addKey('id', true);
 		$this->forge->createTable('empty', true);

_support/Database/MockConnection.php

@@ -1,5 +1,6 @@
 <?php namespace Tests\Support\Database;
 
+use CodeIgniter\CodeIgniter;
 use CodeIgniter\Database\BaseConnection;
 
 class MockConnection extends BaseConnection
@@ -21,7 +22,23 @@ public function shouldReturn(string $method, $return)
 
 	//--------------------------------------------------------------------
 
-	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, $queryClass = 'CodeIgniter\\Database\\Query')
+	/**
+	 * Orchestrates a query against the database. Queries must use
+	 * Database\Statement objects to store the query and build it.
+	 * This method works with the cache.
+	 *
+	 * Should automatically handle different connections for read/write
+	 * queries if needed.
+	 *
+	 * @param string  $sql
+	 * @param mixed   ...$binds
+	 * @param boolean $setEscapeFlags
+	 * @param string  $queryClass
+	 *
+	 * @return \CodeIgniter\Database\BaseResult|\CodeIgniter\Database\Query|false
+	 */
+
+	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = 'CodeIgniter\\Database\\Query')
 	{
 		$queryClass = str_replace('Connection', 'Query', get_class($this));
 
@@ -60,9 +77,11 @@ public function query(string $sql, $binds = null, bool $setEscapeFlags = true, $
 	/**
 	 * Connect to the database.
 	 *
+	 * @param boolean $persistent
+	 *
 	 * @return mixed
 	 */
-	public function connect($persistent = false)
+	public function connect(bool $persistent = false)
 	{
 		$return = $this->returnValues['connect'] ?? true;
 
@@ -82,9 +101,9 @@ public function connect($persistent = false)
 	 * Keep or establish the connection if no queries have been sent for
 	 * a length of time exceeding the server's idle timeout.
 	 *
-	 * @return mixed
+	 * @return boolean
 	 */
-	public function reconnect()
+	public function reconnect(): bool
 	{
 		return true;
 	}
@@ -110,23 +129,23 @@ public function setDatabase(string $databaseName)
 	/**
 	 * Returns a string containing the version of the database being used.
 	 *
-	 * @return mixed
+	 * @return string
 	 */
-	public function getVersion()
+	public function getVersion(): string
 	{
-		return \CodeIgniter\CodeIgniter::CI_VERSION;
+		return CodeIgniter::CI_VERSION;
 	}
 
 	//--------------------------------------------------------------------
 
 	/**
 	 * Executes the query against the database.
 	 *
-	 * @param $sql
+	 * @param string    $sql
 	 *
 	 * @return mixed
 	 */
-	protected function execute($sql)
+	protected function execute(string $sql)
 	{
 		return $this->returnValues['execute'];
 	}
@@ -136,7 +155,7 @@ protected function execute($sql)
 	/**
 	 * Returns the total number of rows affected by this query.
 	 *
-	 * @return mixed
+	 * @return int
 	 */
 	public function affectedRows(): int
 	{
@@ -154,7 +173,7 @@ public function affectedRows(): int
 	 *
 	 * @return array
 	 */
-	public function error()
+	public function error(): array
 	{
 		return [
 			'code'    => null,
@@ -169,7 +188,7 @@ public function error()
 	 *
 	 * @return integer
 	 */
-	public function insertID()
+	public function insertID(): int
 	{
 		return $this->connID->insert_id;
 	}
@@ -183,7 +202,7 @@ public function insertID()
 	 *
 	 * @return string
 	 */
-	protected function _listTables($constrainByPrefix = false): string
+	protected function _listTables(bool $constrainByPrefix = false): string
 	{
 		return '';
 	}

_support/Database/MockResult.php

@@ -68,9 +68,9 @@ public function dataSeek($n = 0)
 	 *
 	 * Overridden by driver classes.
 	 *
-	 * @return array
+	 * @return mixed
 	 */
-	protected function fetchAssoc(): array
+	protected function fetchAssoc()
 	{
 	}
 

_support/Database/MockTestClass.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Tests\Support\Database;
+
+class MockTestClass
+{
+}

_support/Events/MockEvents.php

@@ -32,7 +32,7 @@
  * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
  * @license    https://opensource.org/licenses/MIT	MIT License
  * @link       https://codeigniter.com
- * @since      Version 3.0.0
+ * @since      Version 4.0.0
  * @filesource
  */
 

_support/Language/en/Core.php

@@ -7,7 +7,7 @@
  * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
  * @license    https://opensource.org/licenses/MIT	MIT License
  * @link       https://codeigniter.com
- * @since      Version 3.0.0
+ * @since      Version 4.0.0
  * @filesource
  *
  * @codeCoverageIgnore

_support/Models/EntityModel.php

@@ -10,7 +10,9 @@ class EntityModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'datetime';
+	protected $dateFormat = 'int';
+
+	protected $deletedField = 'deleted';
 
 	protected $allowedFields = [
 		'name',

_support/Models/EventModel.php

@@ -10,7 +10,7 @@ class EventModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'datetime';
 
 	protected $allowedFields = [
 		'name',

_support/Models/JobModel.php

@@ -10,10 +10,14 @@ class JobModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'int';
 
 	protected $allowedFields = [
 		'name',
 		'description',
 	];
+
+	public $name = '';
+
+	public $description = '';
 }

_support/Models/SecondaryModel.php

@@ -12,7 +12,7 @@ class SecondaryModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'int';
 
 	protected $allowedFields = [
 		'key',

_support/Models/SimpleEntity.php

@@ -15,7 +15,9 @@ class SimpleEntity extends Entity
 	protected $id;
 	protected $name;
 	protected $description;
+	protected $deleted;
 	protected $created_at;
+	protected $updated_at;
 
 	protected $_options = [
 		'datamap' => [],

_support/Models/UserModel.php

@@ -17,5 +17,11 @@ class UserModel extends Model
 
 	protected $useSoftDeletes = true;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'datetime';
+
+	public $name = '';
+
+	public $email = '';
+
+	public $country = '';
 }

_support/Models/ValidErrorsModel.php

@@ -10,7 +10,7 @@ class ValidErrorsModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'int';
 
 	protected $allowedFields = [
 		'name',

_support/Models/ValidModel.php

@@ -10,7 +10,7 @@ class ValidModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'int';
 
 	protected $allowedFields = [
 		'name',

_support/View/MockTable.php

@@ -0,0 +1,17 @@
+<?php
+namespace Tests\Support\View;
+
+class MockTable extends \CodeIgniter\View\Table {
+
+	// Override inaccessible protected method
+	public function __call($method, $params)
+	{
+		if (is_callable([$this, '_' . $method]))
+		{
+			return call_user_func_array([$this, '_' . $method], $params);
+		}
+
+		throw new BadMethodCallException('Method ' . $method . ' was not found');
+	}
+
+}

app/Config/App.php

@@ -264,19 +264,4 @@ class App extends BaseConfig
 	*/
 	public $CSPEnabled = false;
 
-	/*
-	|--------------------------------------------------------------------------
-	| Application Salt
-	|--------------------------------------------------------------------------
-	|
-	| The $salt can be used anywhere within the application that you need
-	| to provide secure data. It should be different for every application
-	| and can be of any length, though the more random the characters
-	| the better.
-	|
-	*/
-	public $salt = '';
-
-	//--------------------------------------------------------------------
-
 }