Skip to content

Commit

Permalink
Some statics to non-statics.
Browse files Browse the repository at this point in the history
  • Loading branch information
Marko Kallio committed Jan 4, 2016
1 parent 5e34e74 commit 36d7788
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 81 deletions.
4 changes: 2 additions & 2 deletions src/YamlRoute/ConversionTrait.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ trait ConversionTrait
*
* @return string
*/
private static function _arrToStr($array)
private function _arrToStr($array)
{
$str = '[';
foreach ($array as $key => $value) {
Expand All @@ -39,7 +39,7 @@ private static function _arrToStr($array)
*
* @return mixed
*/
private static function _varsToString($string)
private function _varsToString($string)
{
$string = str_replace('{', ':', $string);

Expand Down
117 changes: 60 additions & 57 deletions src/YamlRoute/Generator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Generator
*
* @var array
*/
private static $_routeConfigs = [];
private $_routeConfigs = [];

/**
* Instance of Generator
Expand All @@ -33,17 +33,17 @@ class Generator
/**
* @var
*/
private static $_dump;
private $_dump;

/**
* @var bool
*/
private static $_debug = false;
private $_debug = false;

/**
* @var bool
*/
private static $_executed = [
private $_executed = [
'\Cake\Core\Plugin::routes()' => false,
];

Expand All @@ -66,30 +66,30 @@ public static function getInstance()
*
* @param $config
*/
private static function _addRouteConfig($config)
private function _addRouteConfig($config)
{
self::$_routeConfigs[] = $config;
$this->_routeConfigs[] = $config;
}

/**
* Set route configurations
*/
private static function _setRouteConfigs()
private function _setRouteConfigs()
{
foreach (Plugin::getLoaded() as $item) {
self::_addRouteConfig($item);
foreach (Plugin::getInstance()->getLoaded() as $item) {
$this->_addRouteConfig($item);
}
}

/**
* Load project routes.yml file
*/
private static function _loadProjectConfig()
private function _loadProjectConfig()
{
$path = ROOT . DS . 'config' . DS . 'routes.yml';
if (file_exists($path)) {
$route = Yaml::parse(file_get_contents($path));
self::_addRouteConfig(['name' => 'Project', 'route' => $route]);
$this->_addRouteConfig(['name' => 'Project', 'route' => $route]);
}
}

Expand All @@ -98,27 +98,26 @@ private static function _loadProjectConfig()
*
* @return array
*/
private static function _getRouteConfigs()
private function _getRouteConfigs()
{
return self::$_routeConfigs;
return $this->_routeConfigs;
}

/**
* Generate routes
*/
private static function _generateRoutes()
private function _generateRoutes()
{
self::_loadProjectConfig();
$configs = self::_getRouteConfigs();
$this->_loadProjectConfig();
$configs = $this->_getRouteConfigs();
foreach ($configs as $config) {
if (isset($config['route'])) {
foreach ($config['route'] as $name => $route) {

self::_newRoute($name, $route);
$this->_newRoute($name, $route);
}
}
}
self::_pluginRoutes();
$this->_pluginRoutes();
}

/**
Expand All @@ -127,7 +126,7 @@ private static function _generateRoutes()
* @param $name
* @param $route
*/
private static function _newRoute($name, $route)
private function _newRoute($name, $route)
{
$method = 'scope';
$path = '/';
Expand All @@ -137,7 +136,7 @@ private static function _newRoute($name, $route)
if (!is_array($route['config'])) {
$route['config'] = self::_loadRouteConfig($route['config']);
}
if (isset($route['config']['plugin']) && Plugin::isLoaded($route['config']['plugin'])) {
if (isset($route['config']['plugin']) && Plugin::getInstance()->isLoaded($route['config']['plugin'])) {
$method = 'plugin';
$path = $route['config']['plugin'];
$options = ['path' => $route['path']];
Expand All @@ -152,8 +151,8 @@ private static function _newRoute($name, $route)
}

// Debugging
if (self::$_debug) {
self::_addToDump("\\Cake\\Routing\\Router::$method('$path', " . self::_arrToStr($options) . ", function (" . '$routes' . ") {");
if ($this->_debug) {
$this->_addToDump("\\Cake\\Routing\\Router::$method('$path', " . $this->_arrToStr($options) . ", function (" . '$routes' . ") {");
}

Router::$method(
Expand All @@ -164,11 +163,11 @@ private static function _newRoute($name, $route)
if (isset($route['config']['extensions']) && is_array($route['config']['extensions'])) {
/* @var \Cake\Routing\Router $routes */
$routes->extensions($route['config']['extensions']);
if (self::$_debug) {
self::_addToDump("\t" . '$routes->extensions(' . self::_arrToStr($route['config']['extensions']) . ');');
if ($this->_debug) {
$this->_addToDump("\t" . '$routes->extensions(' . $this->_arrToStr($route['config']['extensions']) . ');');
}
}
$route = self::_createPassParams($route);
$route = $this->_createPassParams($route);

$opts = [];
foreach ($route['config'] as $key => $item) {
Expand All @@ -177,23 +176,23 @@ private static function _newRoute($name, $route)
}
}

$thirdParam = self::_buildThirdParam($name, $route);
$thirdParam = $this->_buildThirdParam($name, $route);

/* @var \Cake\Routing\Router $routes */
$routes->connect('/', $opts, $thirdParam);

// Debugging
if (self::$_debug) {
self::_addToDump("\t" . '$routes->connect(\'/\', ' . self::_arrToStr($opts) . ', ' . self::_arrToStr($thirdParam) . ');');
if ($this->_debug) {
$this->_addToDump("\t" . '$routes->connect(\'/\', ' . $this->_arrToStr($opts) . ', ' . $this->_arrToStr($thirdParam) . ');');
}
}
if (isset($route['config']) && isset($route['config']['routes'])) {
foreach ($route['config']['routes'] as $key => $x) {
if (isset($x['extensions']) && is_array($x['extensions'])) {
/* @var \Cake\Routing\Router $routes */
$routes->extensions($x['extensions']);
if (self::$_debug) {
self::_addToDump("\t" . '$routes->extensions(' . self::_arrToStr($x['extensions']) . ');');
if ($this->_debug) {
$this->_addToDump("\t" . '$routes->extensions(' . $this->_arrToStr($x['extensions']) . ');');
}
}
$x = self::_createPassParams($x);
Expand All @@ -204,14 +203,14 @@ private static function _newRoute($name, $route)
}
}

$thirdParam = self::_buildThirdParam($key, $x);
$thirdParam = $this->_buildThirdParam($key, $x);

/* @var \Cake\Routing\Router $routes */
$routes->connect('/' . self::_varsToString($x['path']), $opts, $thirdParam);
$routes->connect('/' . $this->_varsToString($x['path']), $opts, $thirdParam);

// Debugging
if (self::$_debug) {
self::_addToDump("\t" . '$routes->connect(\'' . self::_varsToString($x['path']) . '\', ' . self::_arrToStr($opts) . ', ' . self::_arrToStr($thirdParam) . ');');
if ($this->_debug) {
$this->_addToDump("\t" . '$routes->connect(\'' . $this->_varsToString($x['path']) . '\', ' . $this->_arrToStr($opts) . ', ' . $this->_arrToStr($thirdParam) . ');');
}
}
}
Expand All @@ -224,15 +223,15 @@ private static function _newRoute($name, $route)
$routes->fallbacks($fallbacks);

// Debugging
if (self::$_debug) {
self::_addToDump("\t" . '$routes->fallbacks(\'' . $fallbacks . '\');');
if ($this->_debug) {
$this->_addToDump("\t" . '$routes->fallbacks(\'' . $fallbacks . '\');');
}
}
);

// Debugging
if (self::$_debug) {
self::_addToDump('});' . "\n");
if ($this->_debug) {
$this->_addToDump('});' . "\n");
}
}

Expand Down Expand Up @@ -284,15 +283,15 @@ private static function _createPassParams($route)
/**
* Run Plugin::routes()
*/
private static function _pluginRoutes()
private function _pluginRoutes()
{
if (!self::_isExecuted('\Cake\Core\Plugin::routes()')) {
CakePlugin::routes();
self::setExecuted('\Cake\Core\Plugin::routes()');
$this->_setExecuted('\Cake\Core\Plugin::routes()');

// Debugging
if (self::$_debug) {
self::_addToDump('\Cake\Core\Plugin::routes();' . "\n");
if ($this->_debug) {
$this->_addToDump('\Cake\Core\Plugin::routes();' . "\n");
}
}
}
Expand All @@ -302,9 +301,9 @@ private static function _pluginRoutes()
*
* @param $name
*/
private static function setExecuted($name)
private function _setExecuted($name)
{
self::$_executed[$name] = true;
$this->_executed[$name] = true;
}

/**
Expand All @@ -314,29 +313,29 @@ private static function setExecuted($name)
*
* @return mixed
*/
private static function _isExecuted($name)
private function _isExecuted($name)
{
return self::$_executed[$name];
return $this->_executed[$name];
}

/**
* Add item to dump
*
* @param $string
*/
private static function _addToDump($string)
private function _addToDump($string)
{
self::$_dump .= $string . "\n";
$this->_dump .= $string . "\n";
}

/**
* Get dump
*
* @return mixed
*/
public static function getDump()
public function getDump()
{
return trim(self::$_dump);
return trim($this->_dump);
}

/**
Expand All @@ -346,11 +345,11 @@ public static function getDump()
*
* @return array
*/
private static function _loadRouteConfig($config)
private function _loadRouteConfig($config)
{
if (strpos($config, '.') !== false) {
list($plugin, $file) = explode('.', $config);
$pluginPaths = Plugin::getLoaded();
$pluginPaths = Plugin::getInstance()->getLoaded();
$path = $pluginPaths[$plugin] . DS . 'config' . DS . $file . '.yml';
} else {
$path = ROOT . DS . 'config' . DS . $config . '.yml';
Expand All @@ -363,11 +362,15 @@ private static function _loadRouteConfig($config)
* Generate routes based on yml files
*
* @param $debug
*
* @return $this
*/
public static function run($debug = false)
public function run($debug = false)
{
self::$_debug = $debug;
self::_setRouteConfigs();
self::_generateRoutes();
$this->_debug = $debug;
$this->_setRouteConfigs();
$this->_generateRoutes();

return $this;
}
}
Loading

0 comments on commit 36d7788

Please sign in to comment.