Merge branch 'develop' of https://github.com/codeigniter4/CodeIgniter4 into db-underscore

MGatner · MGatner · commit 7c369aaed3a7 · 2019-09-17T11:51:11.000-04:00
diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ if you want to take the lead on one of them.
 
 At this time, 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*](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing.md) section in the user guide.
+Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/CodeIgniter4/blob/develop/CONTRIBUTING.md) section in the user guide.
 
 ## Server Requirements
 
diff --git a/system/Common.php b/system/Common.php
@@ -1084,3 +1084,18 @@ function dd(...$vars)
 		exit;
 	}
 }
+
+
+//--------------------------------------------------------------------
+
+if (! function_exists('trace'))
+{
+	/**
+	 * Provides a backtrace to the current execution point, from Kint.
+	 */
+	function trace()
+	{
+		Kint::$aliases[] = 'trace';
+		Kint::trace();
+	}
+}
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -1528,7 +1528,9 @@ public function listTables(bool $constrainByPrefix = false)
 		// Is there a cached result?
 		if (isset($this->dataCache['table_names']) && $this->dataCache['table_names'])
 		{
-			return $this->dataCache['table_names'];
+			return $constrainByPrefix ?
+				preg_grep("/^{$this->DBPrefix}/", $this->dataCache['table_names'])
+				: $this->dataCache['table_names'];
 		}
 
 		if (false === ($sql = $this->_listTables($constrainByPrefix)))
diff --git a/system/Database/Config.php b/system/Database/Config.php
@@ -87,7 +87,7 @@ public static function connect($group = null, bool $getShared = true)
 			$group  = 'custom-' . md5(json_encode($config));
 		}
 
-		$config = $config ?? new \Config\Database();
+		$config = $config ?? config('Database');
 
 		if (empty($group))
 		{
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
@@ -605,7 +605,7 @@ public function dropTable(string $tableName, bool $ifExists = false, bool $casca
 		}
 
 		// If the prefix is already starting the table name, remove it...
-		if (! empty($this->db->DBPrefix) && strpos($tableName, $this->db->DBPrefix) === 0)
+		if ($this->db->DBPrefix && strpos($tableName, $this->db->DBPrefix) === 0)
 		{
 			$tableName = substr($tableName, strlen($this->db->DBPrefix));
 		}
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
@@ -207,6 +207,7 @@ protected function _escapeString(string $str): string
 	protected function _listTables(bool $prefixLimit = false): string
 	{
 		return 'SELECT "NAME" FROM "SQLITE_MASTER" WHERE "TYPE" = \'table\''
+			   . ' AND "NAME" NOT LIKE \'sqlite_%\''
 			   . (($prefixLimit !== false && $this->DBPrefix !== '')
 				? ' AND "NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . '%\' ' . sprintf($this->likeEscapeStr,
 					$this->likeEscapeChar)
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
@@ -672,10 +672,10 @@ protected function setCURLOptions(array $curl_options = [], array $config = [])
 		}
 
 		// Debug
-		if (isset($config['debug']))
+		if ($config['debug'])
 		{
-			$curl_options[CURLOPT_VERBOSE] = $config['debug'] === true ? 1 : 0;
-			$curl_options[CURLOPT_STDERR]  = $config['debug'] === true ? fopen('php://output', 'w+') : $config['debug'];
+			$curl_options[CURLOPT_VERBOSE] = 1;
+			$curl_options[CURLOPT_STDERR]  = is_string($config['debug']) ? fopen($config['debug'], 'a+') : fopen('php://output', 'w+');
 		}
 
 		// Decode Content
diff --git a/system/Test/CIDatabaseTestCase.php b/system/Test/CIDatabaseTestCase.php
@@ -173,6 +173,7 @@ protected function setUp()
 			{
 				$this->migrations->setNamespace($this->namespace);
 			}
+			$this->migrations->regress(0, 'tests');
 
 			// Delete all of the tables to ensure we're at a clean start.
 			$tables = $this->db->listTables();
@@ -192,7 +193,6 @@ protected function setUp()
 				}
 			}
 
-			$this->migrations->regress(0, 'tests');
 			$this->migrations->latest('tests');
 		}
 
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
@@ -448,7 +448,7 @@ public function testSSLWithBadKey()
 
 	//--------------------------------------------------------------------
 
-	public function testDebugOption()
+	public function testDebugOptionTrue()
 	{
 		$this->request->request('get', 'http://example.com', [
 			'debug' => true,
@@ -461,14 +461,35 @@ public function testDebugOption()
 
 		$this->assertArrayHasKey(CURLOPT_STDERR, $options);
 		$this->assertTrue(is_resource($options[CURLOPT_STDERR]));
+	}
 
+	public function testDebugOptionFalse()
+	{
 		$this->request->request('get', 'http://example.com', [
 			'debug' => false,
 		]);
 
 		$options = $this->request->curl_options;
 
-		$this->assertFalse($options[CURLOPT_STDERR]);
+		$this->assertArrayNotHasKey(CURLOPT_VERBOSE, $options);
+		$this->assertArrayNotHasKey(CURLOPT_STDERR, $options);
+	}
+
+	public function testDebugOptionFile()
+	{
+		$file = SUPPORTPATH . 'Files/baker/banana.php';
+		
+		$this->request->request('get', 'http://example.com', [
+			'debug' => $file,
+		]);
+
+		$options = $this->request->curl_options;
+
+		$this->assertArrayHasKey(CURLOPT_VERBOSE, $options);
+		$this->assertEquals(1, $options[CURLOPT_VERBOSE]);
+
+		$this->assertArrayHasKey(CURLOPT_STDERR, $options);
+		$this->assertTrue(is_resource($options[CURLOPT_STDERR]));
 	}
 
 	//--------------------------------------------------------------------
diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst
@@ -86,4 +86,4 @@ Modifying Directory Locations
 If you've relocated any of the main directories, you can change the configuration
 settings inside ``app/Config/Paths``.
 
-Please read `Managing your Applications <../general/managing.html>`_
+Please read `Managing your Applications <../general/managing_apps.html>`_
diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst
@@ -26,6 +26,8 @@ you are currently connected to. Example::
 	{
 		echo $table;
 	}
+	
+.. note:: Some drivers have additional system tables that are excluded from this return.
 
 Determine If a Table Exists
 ===========================
diff --git a/user_guide_src/source/extending/contributing.rst b/user_guide_src/source/extending/contributing.rst
@@ -44,7 +44,7 @@ Please *don't* disclose it publicly, but e-mail us at security@codeigniter.com,
 or report it via our page on `HackerOne <https://hackerone.com/codeigniter>`_.
 
 If you've found a critical vulnerability, we'd be happy to credit you in our
-`ChangeLog <https://codeigniter4.github.io/userguide/changelog.html>`_.
+`ChangeLog <../changelogs/index.html>`_.
 
 ****************************
 Tips for a Good Issue Report
diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst
@@ -58,8 +58,8 @@ Configuration
 =============
 
 By default, CodeIgniter will display all errors in the ``development`` and ``testing`` environments, and will not
-display any errors in the ``production`` environment. You can change this by locating the environment configuration
-portion at the top of the main ``index.php`` file.
+display any errors in the ``production`` environment. You can change this by setting the ``CI_ENVIRONMENT`` variable
+in the ``.env`` file.
 
 .. important:: Disabling error reporting DOES NOT stop logs from being written if there are errors.
 
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
@@ -221,7 +221,7 @@ If you need to assign options to a group, like a `namespace <#assigning-namespac
 
 This would handle a resource route to the ``App\API\v1\Users`` controller with the ``/api/users`` URI.
 
-You can also use a specific `filter </incoming/filters.html>`_ for a group of routes. This will always
+You can also use a specific `filter <filters.html>`_ for a group of routes. This will always
 run the filter before or after the controller. This is especially handy during authentication or api logging::
 
     $routes->group('api', ['filter' => 'api-auth'], function($routes)
@@ -309,7 +309,7 @@ available from the command line::
 Global Options
 ==============
 
-All of the methods for creating a route (add, get, post, `resource </incoming/resources.html>`_ etc) can take an array of options that
+All of the methods for creating a route (add, get, post, `resource <restful.html>`_ etc) can take an array of options that
 can modify the generated routes, or further restrict them. The ``$options`` array is always the last parameter::
 
 	$routes->add('from', 'to', $options);
@@ -336,7 +336,7 @@ The value for the filter must match one of the aliases defined within ``app/Conf
 
     $routes->add('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
 
-See `Controller filters </incoming/filters.html>`_ for more information on setting up filters.
+See `Controller filters <filters.html>`_ for more information on setting up filters.
 
 Assigning Namespace
 -------------------
diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst
@@ -138,19 +138,6 @@ of encryption::
 	// Encrypt some text & make the results text
 	$encoded = base64_encode($encrypter->encrypt($plaintext));
 
-Message Length
---------------
-
-An encrypted string is usually
-longer than the original plain-text string.
-
-This is influenced by the cipher algorithm itself, the initialization vector (IV) 
-prepended to the
-cipher-text and the HMAC authentication message that is also prepended.
-
-Keep this information in mind when selecting your data storage mechanism.
-Cookies, for example, can only hold 4K of information.
-
 Encryption Handler Notes
 ========================
 
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
@@ -25,7 +25,7 @@ It even reads the current page it should display from the current URL via a ``pa
 
 To provide a paginated list of users in your application, your controller's method would look something like::
 
-    <?php namespace App\Constrollers;
+    <?php namespace App\Controllers;
 
     use CodeIgniter\Controller;
 
@@ -112,10 +112,10 @@ It is also possible to use a URI segment for the page number, instead of the pag
 
 Please note: ``$segment`` value cannot be greater than the number of URI segments plus 1.
 
-If you in need to show many pagers on one page then additional parameter which wil define a group could be helpful::
+If you in need to show many pagers on one page then additional parameter which will define a group could be helpful::
 
 	$pager = service('pager');
-	$pager->setPath('path/for/my-group', 'my-group'); // Additionaly you could define path for every group.
+	$pager->setPath('path/for/my-group', 'my-group'); // Additionally you could define path for every group.
 	$pager->makeLinks($page, $perPage, $total, 'template_name', $segment, 'my-group'); 
 
 Paginating with Only Expected Queries
diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
@@ -498,10 +498,12 @@ Much like Time's humanize() method, this returns a string that displays the diff
 human readable format that is geared towards being easily understood. It can create strings like '3 hours ago',
 'in 1 month', etc. The biggest differences are in how very recent dates are handled::
 
-    // Assume current time is: March 10, 2017 (America/Chicago)
-    $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
+    $current = Time::parse('March 10, 2017', 'America/Chicago')
+    $test    = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 
-    echo $time->humanize();     // 1 year ago
+    $diff = $current->difference($test)
+
+    echo $diff->humanize();     // 1 year ago
 
 The exact time displayed is determined in the following manner:
 
diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst
@@ -2,7 +2,7 @@
 Working with URIs
 *****************
 
-CodeIngiter provides an object oriented solution for working with URI's in your application. Using this makes it
+CodeIgniter provides an object oriented solution for working with URI's in your application. Using this makes it
 simple to ensure that the structure is always correct, no matter how complex the URI might be, as well as adding
 relative URI to an existing one and have it resolved safely and correctly.
 
diff --git a/user_guide_src/source/outgoing/view_layouts.rst b/user_guide_src/source/outgoing/view_layouts.rst
@@ -38,7 +38,7 @@ what to name the content section.
 Using Layouts in Views
 **********************
 
-Whenveer a view wants to be inserted into a layout, it must use the ``extend()`` method at the top of the file::
+Whenever a view wants to be inserted into a layout, it must use the ``extend()`` method at the top of the file::
 
     <?= $this->extend('default') ?>
 
diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
@@ -425,7 +425,7 @@ The following filters are available when using the parser:
 +---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
 + highlight_code+                     + Highlights code samples with HTML/CSS.                       + { v|highlight_code }                +
 +---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ limit_chars   + limit               + Limits the number of chracters to $limit.                    + { v|limit_chars(100) }              +
++ limit_chars   + limit               + Limits the number of characters to $limit.                   + { v|limit_chars(100) }              +
 +---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
 + limit_words   + limit               + Limits the number of words to $limit.                        + { v|limit_words(20) }               +
 +---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
@@ -4,7 +4,7 @@ Testing Controllers
 
 Testing your controllers is made convenient with a couple of new helper classes and traits. When testing controllers,
 you can execute the code within a controller, without first running through the entire application bootstrap process.
-Often times, using the `Feature Testing tools </testing/feature>`_ will be simpler, but this functionality is here in
+Often times, using the `Feature Testing tools <feature.html>`_ will be simpler, but this functionality is here in
 case you need it.
 
 .. note:: Because the entire framework has not been bootstrapped, there will be times when you cannot test a controller
diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
@@ -11,7 +11,7 @@ Replace var_dump
 ================
 
 While using XDebug and a good IDE can be indispensable to debug your application, sometimes a quick ``var_dump()`` is
-all you need. CodeIgniter makes that even better by bundling in the excellent `Kint <https://raveren.github.io/kint/>`_
+all you need. CodeIgniter makes that even better by bundling in the excellent `Kint <https://kint-php.github.io/kint/>`_
 debugging tool for PHP. This goes way beyond your usual tool, providing many alternate pieces of data, like formatting
 timestamps into recognizable dates, showing you hexcodes as colors, display array data like a table for easy reading,
 and much, much more.
@@ -42,7 +42,7 @@ This method is identical to ``d()``, except that it also ``dies()`` and no furth
 
 This provides a backtrace to the current execution point, with Kint's own unique spin::
 
-    Kint::trace();
+    trace();
 
 For more information, see `Kint's page <https://kint-php.github.io/kint//>`_.
 
diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
@@ -15,7 +15,7 @@ The Test Class
 ==============
 
 Feature testing requires that all of your test classes extend the ``CodeIgniter\Test\FeatureTestCase`` class. Since this
-extends `CIDatabaseTestCase </testing/database>`_ you must always ensure that ``parent::setUp()`` and ``parent::tearDown()``
+extends `CIDatabaseTestCase <database.html>`_ you must always ensure that ``parent::setUp()`` and ``parent::tearDown()``
 are called before you take your actions.
 ::
 
@@ -243,11 +243,11 @@ a tag, as specified by type, class, or id::
     // Check that "Hello World" is on the page
     $this->assertSee('Hello World');
     // Check that "Hello World" is within an h1 tag
-    $this->assertS('Hello World', 'h1');
+    $this->assertSee('Hello World', 'h1');
     // Check that "Hello World" is within an element with the "notice" class
-    $this->assertS('Hello World', '.notice');
+    $this->assertSee('Hello World', '.notice');
     // Check that "Hello World" is within an element with id of "title"
-    $this->assertS('Hellow World', '#title');
+    $this->assertSee('Hellow World', '#title');
 
 
 **assertDontSee(string $search = null, string $element = null)**
@@ -256,7 +256,7 @@ Asserts the exact opposite of the **assertSee()** method::
 
     // Checks that "Hello World" does NOT exist on the page
     $results->dontSee('Hello World');
-    // Checks that "Hellow World" does NOT exist within any h1 tag
+    // Checks that "Hello World" does NOT exist within any h1 tag
     $results->dontSee('Hello World', 'h1');
 
 **assertSeeElement(string $search)**
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
@@ -95,7 +95,7 @@ have the correct namespace relative to ``App``.
 
 .. note:: Namespaces are not strictly required for test classes, but they are helpful to ensure no class names collide.
 
-When testing database results, you must use the `CIDatabaseTestClass </testing/database>`_ class.
+When testing database results, you must use the `CIDatabaseTestClass <database.html>`_ class.
 
 Additional Assertions
 ---------------------
@@ -143,7 +143,7 @@ in PHPunit <https://phpunit.readthedocs.io/en/7.4/annotations.html#runinseparate
 
 **assertHeaderNotEmitted($header, $ignoreCase=false)**
 
-Ensure that a header or cookie was actually emitted::
+Ensure that a header or cookie was not emitted::
 
     $response->setCookie('foo', 'bar');
 
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
@@ -236,7 +236,7 @@ add some code to the controller and create a new view. Go back to the
 
 		if (empty($data['news']))
 		{
-			throw new \CodeIgniter\PageNotFoundException('Cannot find the news item: '. $slug);
+			throw new \CodeIgniter\Exceptions\PageNotFoundException('Cannot find the news item: '. $slug);
 		}
 
 		$data['title'] = $data['news']['title'];
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
@@ -41,9 +41,9 @@ code.
             return view('welcome_message');
         }
 
-		public function showme($page = 'home')
-		{
-		}
+        public function showme($page = 'home')
+        {
+        }
 	}
 
 You have created a class named ``Pages``, with a ``showme`` method that accepts

Original file line number	Diff line number	Diff line change
`@@ -1528,7 +1528,9 @@ public function listTables(bool $constrainByPrefix = false)`
`1528`	`1528`	`// Is there a cached result?`
`1529`	`1529`	`if (isset($this->dataCache['table_names']) && $this->dataCache['table_names'])`
`1530`	`1530`	`{`
`1531`		`- return $this->dataCache['table_names'];`
	`1531`	`+ return $constrainByPrefix ?`
	`1532`	`+ preg_grep("/^{$this->DBPrefix}/", $this->dataCache['table_names'])`
	`1533`	`+ : $this->dataCache['table_names'];`
`1532`	`1534`	`}`
`1533`	`1535`
`1534`	`1536`	`if (false === ($sql = $this->_listTables($constrainByPrefix)))`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public static function connect($group = null, bool $getShared = true)`
`87`	`87`	`$group = 'custom-' . md5(json_encode($config));`
`88`	`88`	`}`
`89`	`89`
`90`		`- $config = $config ?? new \Config\Database();`
	`90`	`+ $config = $config ?? config('Database');`
`91`	`91`
`92`	`92`	`if (empty($group))`
`93`	`93`	`{`
Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ public function dropTable(string $tableName, bool $ifExists = false, bool $casca`
`605`	`605`	`}`
`606`	`606`
`607`	`607`	`// If the prefix is already starting the table name, remove it...`
`608`		`- if (! empty($this->db->DBPrefix) && strpos($tableName, $this->db->DBPrefix) === 0)`
	`608`	`+ if ($this->db->DBPrefix && strpos($tableName, $this->db->DBPrefix) === 0)`
`609`	`609`	`{`
`610`	`610`	`$tableName = substr($tableName, strlen($this->db->DBPrefix));`
`611`	`611`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,7 @@ protected function _escapeString(string $str): string`
`207`	`207`	`protected function _listTables(bool $prefixLimit = false): string`
`208`	`208`	`{`
`209`	`209`	`return 'SELECT "NAME" FROM "SQLITE_MASTER" WHERE "TYPE" = \'table\''`
	`210`	`+ . ' AND "NAME" NOT LIKE \'sqlite_%\''`
`210`	`211`	`. (($prefixLimit !== false && $this->DBPrefix !== '')`
`211`	`212`	`? ' AND "NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . '%\' ' . sprintf($this->likeEscapeStr,`
`212`	`213`	`$this->likeEscapeChar)`
Original file line number	Diff line number	Diff line change
`@@ -672,10 +672,10 @@ protected function setCURLOptions(array $curl_options = [], array $config = [])`
`672`	`672`	`}`
`673`	`673`
`674`	`674`	`// Debug`
`675`		`- if (isset($config['debug']))`
	`675`	`+ if ($config['debug'])`
`676`	`676`	`{`
`677`		`- $curl_options[CURLOPT_VERBOSE] = $config['debug'] === true ? 1 : 0;`
`678`		`- $curl_options[CURLOPT_STDERR] = $config['debug'] === true ? fopen('php://output', 'w+') : $config['debug'];`
	`677`	`+ $curl_options[CURLOPT_VERBOSE] = 1;`
	`678`	`+ $curl_options[CURLOPT_STDERR] = is_string($config['debug']) ? fopen($config['debug'], 'a+') : fopen('php://output', 'w+');`
`679`	`679`	`}`
`680`	`680`
`681`	`681`	`// Decode Content`
Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ protected function setUp()`
`173`	`173`	`{`
`174`	`174`	`$this->migrations->setNamespace($this->namespace);`
`175`	`175`	`}`
	`176`	`+ $this->migrations->regress(0, 'tests');`
`176`	`177`
`177`	`178`	`// Delete all of the tables to ensure we're at a clean start.`
`178`	`179`	`$tables = $this->db->listTables();`
`@@ -192,7 +193,6 @@ protected function setUp()`
`192`	`193`	`}`
`193`	`194`	`}`
`194`	`195`
`195`		`- $this->migrations->regress(0, 'tests');`
`196`	`196`	`$this->migrations->latest('tests');`
`197`	`197`	`}`
`198`	`198`