malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:bcit-ci/CodeIgniter4 into develop

Browse Source
This commit is contained in:
Lonnie Ezell 2017-08-08 22:31:30 -05:00
commit ac3d214626
7 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/Config/Constants.php
View File

@ -31,13 +31,14 @@ define('COMPOSER_PATH', ROOTPATH.'vendor/autoload.php');
| Provide simple ways to work with the myriad of PHP functions that
| require information to be in seconds.
*/
defined('SECOND') || define('SECOND', 1);
defined('MINUTE') || define('MINUTE', 60);
defined('HOUR') || define('HOUR', 3600);
defined('DAY') || define('DAY', 86400);
defined('WEEK') || define('WEEK', 604800);
defined('MONTH') || define('MONTH', 2592000);
defined('YEAR') || define('YEAR', 31536000);
defined('SECOND') || define('SECOND', 1);
defined('MINUTE') || define('MINUTE', 60);
defined('HOUR') || define('HOUR', 3600);
defined('DAY') || define('DAY', 86400);
defined('WEEK') || define('WEEK', 604800);
defined('MONTH') || define('MONTH', 2592000);
defined('YEAR') || define('YEAR', 31536000);
defined('DECADE') || define('DECADE', 315360000);
/*
|--------------------------------------------------------------------------

2
system/CLI/CLI.php
View File

@ -249,7 +249,7 @@ class CLI
{
$extra_output = ' [ Default: "' . $default . '" ]';
}
elseif ($options !== [])
elseif (! empty($options))
{
$extra_output = ' [ ' . implode(', ', $options) . ' ]';
}

2
system/View/Cell.php
View File

@ -126,7 +126,7 @@ class Cell
if ($paramCount === 0)
{
if ($paramArray !== [])
if (! empty($paramArray))
{
throw new \InvalidArgumentException("{$class}::{$method} has no params.");
}

2
system/View/Parser.php
View File

@ -642,7 +642,7 @@ class Parser extends View
}
// Get our filter name
$filter = $param !== [] ? trim(strtolower(substr($filter, 0, strpos($filter, '(')))) : trim($filter);
$filter = ! empty($param) ? trim(strtolower(substr($filter, 0, strpos($filter, '(')))) : trim($filter);
if ( ! array_key_exists($filter, $this->config->filters))
continue;

2
tests/system/I18n/TimeTest.php
View File

@ -697,7 +697,7 @@ class TimeTest extends \CIUnitTestCase
$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
$time2 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
$this->assertTrue($time1->equal($time2));
$this->assertTrue($time1->equals($time2));
}
public function testEqualWithDateTime()

4
user_guide_src/source/general/common_functions.rst
View File

@ -343,3 +343,7 @@ Time Constants
.. php:const:: YEAR
Equals 31536000.
.. php:const:: DECADE
Equals 315360000.

22
user_guide_src/source/installation/index.rst
View File

@ -7,9 +7,21 @@ CodeIgniter4 can be installed manually, or using Composer.
Manual Installation
===================
CodeIgniter is installed in four steps:
CodeIgniter is installed via manual download and unzip the package.
Composer Installation
=====================
While not required, CodeIgniter can be installed via `composer <https://getcomposer.org>`_ create-project command.
::
composer create-project codeigniter4/framework
Running
=======
#. Unzip the package.
#. Upload the CodeIgniter folders and files to your server. The
**index.php** file will be in the **public** folder inside
your project root.
@ -48,11 +60,6 @@ If you're new to CodeIgniter, please read the :doc:`Getting
Started <../intro/index>` section of the User Guide
to begin learning how to build dynamic PHP applications. Enjoy!
Composer Installation
=====================
TODO
.. toctree::
:hidden:
@ -63,4 +70,3 @@ TODO
upgrading
troubleshooting
local_server