Skip to content
This repository has been archived by the owner on Dec 2, 2019. It is now read-only.

Commit

Permalink
Update codeigniter
Browse files Browse the repository at this point in the history
  • Loading branch information
deathart committed May 30, 2018
1 parent cb9b2bc commit 68f4723
Show file tree
Hide file tree
Showing 37 changed files with 364 additions and 109 deletions.
8 changes: 4 additions & 4 deletions application/Config/Paths.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Paths
* Include the path if the folder is not in the same directory
* as this file.
*/
public $systemDirectory = '../system';
public $systemDirectory = 'system';

/*
*---------------------------------------------------------------
Expand All @@ -34,7 +34,7 @@ class Paths
*
* NO TRAILING SLASH!
*/
public $applicationDirectory = '../application';
public $applicationDirectory = 'application';

/*
* ---------------------------------------------------------------
Expand All @@ -47,7 +47,7 @@ class Paths
* for maximum security, keeping it out of the application and/or
* system directories.
*/
public $writableDirectory = '../writable';
public $writableDirectory = 'writable';

/*
* ---------------------------------------------------------------
Expand All @@ -60,7 +60,7 @@ class Paths
* for maximum security, keeping it out of the application and/or
* system directories.
*/
public $testsDirectory = '../tests';
public $testsDirectory = 'tests';

/*
* ---------------------------------------------------------------
Expand Down
14 changes: 8 additions & 6 deletions public/index.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php
// Location to the Paths config file.
// This should be the only line you need to
// edit in this file.
$pathsPath = '../application/Config/Paths.php';

// Path to the front controller (this file)
define('FCPATH', __DIR__.DIRECTORY_SEPARATOR);

// Location of the Paths config file.
// This is the first of two lines that might need to be changed, depending on your folder structure.
$pathsPath = FCPATH . '../application/Config/Paths.php';

/*
*---------------------------------------------------------------
* BOOTSTRAP THE APPLICATION
Expand All @@ -23,7 +23,9 @@
require $pathsPath;
$paths = new Config\Paths();

$app = require rtrim($paths->systemDirectory,'/ ').'/bootstrap.php';
// Location of the framework bootstrap file.
// This is the second of two lines that might need to be changed, depending on your folder structure.
$app = require FCPATH . '../system//bootstrap.php';

/*
*---------------------------------------------------------------
Expand All @@ -32,4 +34,4 @@
* Now that everything is setup, it's time to actually fire
* up the engines and make this app do it's thang.
*/
$app->run();
$app->run();
2 changes: 1 addition & 1 deletion system/CLI/Exceptions/CLIException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ class CLIException extends \RuntimeException
*/
public static function forInvalidColor(string $type, string $color)
{
return new self(lang('CLI.invalidColor', [$type, $color]));
return new static(lang('CLI.invalidColor', [$type, $color]));
}
}
6 changes: 3 additions & 3 deletions system/Cache/Exceptions/CacheException.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ class CacheException extends \RuntimeException implements ExceptionInterface
*/
public static function forInvalidHandlers()
{
return new self(lang('Cache.invalidHandlers'));
return new static(lang('Cache.invalidHandlers'));
}

/**
* @return \CodeIgniter\Cache\Exceptions\CacheException
*/
public static function forNoBackup()
{
return new self(lang('Cache.noBackup'));
return new static(lang('Cache.noBackup'));
}

/**
* @return \CodeIgniter\Cache\Exceptions\CacheException
*/
public static function forHandlerNotFound()
{
return new self(lang('Cache.handlerNotFound'));
return new static(lang('Cache.handlerNotFound'));
}
}
123 changes: 123 additions & 0 deletions system/Commands/Utilities/Namespaces.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?php namespace CodeIgniter\Commands\Utilities;

/**
* CodeIgniter
*
* An open source application development framework for PHP
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014-2018 British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @package CodeIgniter
* @author CodeIgniter Dev Team
* @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
* @filesource
*/
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Autoload;

/**
* Lists namespaces set in Config\Autoload with their
* full server path. Helps you to verify that you have
* the namespaces setup correctly.
*
* @package CodeIgniter\Commands
*/
class Namespaces extends BaseCommand
{

/**
* The group the command is lumped under
* when listing commands.
*
* @var string
*/
protected $group = 'CodeIgniter';

/**
* The Command's name
*
* @var string
*/
protected $name = 'namespaces';

/**
* the Command's short description
*
* @var string
*/
protected $description = 'Verifies your namespaces are setup correctly.';

/**
* the Command's usage
*
* @var string
*/
protected $usage = 'namespaces';

/**
* the Command's Arguments
*
* @var array
*/
protected $arguments = [];

/**
* the Command's Options
*
* @var array
*/
protected $options = [];

//--------------------------------------------------------------------

/**
* Displays the help for the spark cli script itself.
*
* @param array $params
*/
public function run(array $params)
{
$config = new Autoload();

$tbody = [];
foreach ($config->psr4 as $ns => $path)
{
$path = realpath($path) ?? $path;

$tbody[] = [
$ns,
realpath($path) ?? $path,
is_dir($path) ? "Yes" : "MISSING"
];
}

$thead = ['Namespace', 'Path', 'Found?'];

CLI::table($tbody, $thead);
}

}
126 changes: 126 additions & 0 deletions system/Commands/Utilities/Routes.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<?php namespace CodeIgniter\Commands\Utilities;

/**
* CodeIgniter
*
* An open source application development framework for PHP
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014-2018 British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*RouRouddfdf
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @package CodeIgniter
* @author CodeIgniter Dev Team
* @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
* @filesource
*/
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Autoload;
use Config\Services;

/**
* Lists all of the user-defined routes. This will include any Routes files
* that can be discovered, but will NOT include any routes that are not defined
* in a routes file, but are instead discovered through auto-routing.
*
* @package CodeIgniter\Commands
*/
class Routes extends BaseCommand
{

/**
* The group the command is lumped under
* when listing commands.
*
* @var string
*/
protected $group = 'CodeIgniter';

/**
* The Command's name
*
* @var string
*/
protected $name = 'routes';

/**
* the Command's short description
*
* @var string
*/
protected $description = 'Displays all of user-defined routes. Does NOT display auto-detected routes.';

/**
* the Command's usage
*
* @var string
*/
protected $usage = 'routes';

/**
* the Command's Arguments
*
* @var array
*/
protected $arguments = [];

/**
* the Command's Options
*
* @var array
*/
protected $options = [];

//--------------------------------------------------------------------

/**
* Displays the help for the spark cli script itself.
*
* @param array $params
*/
public function run(array $params)
{
$collection = Services::routes(true);
$methods = ['get', 'head', 'post', 'put', 'delete', 'options', 'trace', 'connect', 'cli'];

$tbody = [];
foreach ($methods as $method)
{
$routes = $collection->getRoutes($method);

foreach ($routes as $from => $to)
$tbody[] = [
$from,
$method,
$to
];
}

$thead = ['Route', 'Method', 'Command'];

CLI::table($tbody, $thead);
}

}
8 changes: 4 additions & 4 deletions system/Database/Exceptions/DataException.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class DataException extends \RuntimeException implements ExceptionInterface
*/
public static function forInvalidMethodTriggered(string $method)
{
return new self(lang('Database.invalidEvent', [$method]));
return new static(lang('Database.invalidEvent', [$method]));
}

/**
Expand All @@ -24,7 +24,7 @@ public static function forInvalidMethodTriggered(string $method)
*/
public static function forEmptyDataset(string $mode)
{
return new self(lang('Database.emptyDataset', [$mode]));
return new static(lang('Database.emptyDataset', [$mode]));
}

/**
Expand All @@ -38,11 +38,11 @@ public static function forEmptyDataset(string $mode)
*/
public static function forInvalidArgument(string $argument)
{
return new self(lang('Database.invalidArgument', [$argument]));
return new static(lang('Database.invalidArgument', [$argument]));
}

public static function forInvalidAllowedFields(string $model)
{
return new self(lang('Database.invalidAllowedFields', [$model]));
return new static(lang('Database.invalidAllowedFields', [$model]));
}
}
Loading

0 comments on commit 68f4723

Please sign in to comment.