TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused class and change function name to be PSR1 compliant

Browse Source
This commit is contained in:
Manuel Raynaud
2014-03-10 12:03:57 +01:00
parent 81a09e1a98
commit 191a120aa5
6 changed files with 14 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Controller/Admin/TranslationsController.php
View File

@@ -117,7 +117,7 @@ class TranslationsController extends BaseAdminController
$translations = $this->getRequest()->get('translation', array());
TemplateHelper::getInstance()->write_translation($file, $texts, $translations);
TemplateHelper::getInstance()->writeTranslation($file, $texts, $translations);
if ($save_mode == 'stay')
$this->redirectToRoute("admin.configuration.translations", $templateArguments);

6
core/lib/Thelia/Core/Template/Smarty/AbstractSmartyPlugin.php
View File

@@ -35,10 +35,10 @@ abstract class AbstractSmartyPlugin
/**
* Explode a comma separated list in a array, trimming all array elements
*
* @param unknown $commaSeparatedValues
* @return multitype:
* @param mixed $commaSeparatedValues
* @return mixed:
*/
protected function _explode($commaSeparatedValues)
protected function explode($commaSeparatedValues)
{
if (null === $commaSeparatedValues) {
return array();

6
core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php
View File

@@ -43,7 +43,7 @@ class AdminUtilities extends AbstractSmartyPlugin
$this->securityContext = $securityContext;
}
protected function fetch_snippet($smarty, $templateName, $variablesArray)
protected function fetchSnippet($smarty, $templateName, $variablesArray)
{
$data = '';
@@ -97,7 +97,7 @@ class AdminUtilities extends AbstractSmartyPlugin
$module === null ? array() : array($module),
array($access))
) {
return $this->fetch_snippet($smarty, 'includes/admin-utilities-position-block', array(
return $this->fetchSnippet($smarty, 'includes/admin-utilities-position-block', array(
'admin_utilities_go_up_url' => URL::getInstance()->absoluteUrl($path, array('mode' => 'up', $url_parameter => $id)),
'admin_utilities_in_place_edit_class' => $in_place_edit_class,
'admin_utilities_object_id' => $id,
@@ -146,7 +146,7 @@ class AdminUtilities extends AbstractSmartyPlugin
$order_change = $order;
}
return $this->fetch_snippet($smarty, 'includes/admin-utilities-sortable-column-header', array(
return $this->fetchSnippet($smarty, 'includes/admin-utilities-sortable-column-header', array(
'admin_utilities_sort_direction' => $sort_direction,
'admin_utilities_sorting_url' => URL::getInstance()->absoluteUrl($path, array($request_parameter_name => $order_change)),
'admin_utilities_header_text' => $label

8
core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php
View File

@@ -53,10 +53,10 @@ class Security extends AbstractSmartyPlugin
*/
public function checkAuthFunction($params, &$smarty)
{
$roles = $this->_explode($this->getParam($params, 'role'));
$resources = $this->_explode($this->getParam($params, 'resource'));
$modules = $this->_explode($this->getParam($params, 'module'));
$accesses = $this->_explode($this->getParam($params, 'access'));
$roles = $this->explode($this->getParam($params, 'role'));
$resources = $this->explode($this->getParam($params, 'resource'));
$modules = $this->explode($this->getParam($params, 'module'));
$accesses = $this->explode($this->getParam($params, 'access'));
if (! $this->securityContext->isGranted($roles, $resources, $modules, $accesses)) {

6
core/lib/Thelia/Core/Template/TemplateHelper.php
View File

@@ -139,7 +139,7 @@ class TemplateHelper
}
}
protected function normalize_path($path)
protected function normalizePath($path)
{
$path = str_replace(
str_replace('\\', '/', THELIA_ROOT),
@@ -203,7 +203,7 @@ class TemplateHelper
if ($content = file_get_contents($fileInfo->getPathName())) {
$short_path = $this->normalize_path($fileInfo->getPathName());
$short_path = $this->normalizePath($fileInfo->getPathName());
Tlog::getInstance()->debug("Examining file $short_path\n");
@@ -249,7 +249,7 @@ class TemplateHelper
}
public function write_translation($file, $texts, $translations)
public function writeTranslation($file, $texts, $translations)
{
if ($fp = @fopen($file, 'w')) {

132
core/lib/Thelia/Tools/DIGenerator.php
View File

@@ -1,132 +0,0 @@
<?php
/*************************************************************************************/
/* */
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation; either version 3 of the License */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */
/*************************************************************************************/
namespace Thelia\Tools;
class DIGenerator
{
/**
* Find all models in a directory
*
* @param string $directory Directory where models have to be find.
* @param array $exclude Model to be exclude in the return
*
* @return array key is the service name and value the full Class name (including namespace if needed)
*
* @throws \RuntimeException id $directory is not a valid directory
*
*/
public static function genDiModel($directory, array $exclude = array())
{
if(!is_string($directory)) return array();
if (!is_dir($directory)) {
throw new \RuntimeException($directory." is not a valid directory");
}
$results = array();
$files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory));
foreach ($files as $file) {
//$file is instance of SplFileInfo
if(!$file->isFile()) continue;
$filePath = $file->getRealPath();
$classes = self::findClasses($filePath);
foreach ($classes as $class) {
$classInfo = new \ReflectionClass($class);
$shortName = $classInfo->getShortName();
if (!in_array($shortName, $exclude)) {
$results[$shortName] = $class;
}
}
}
return $results;
}
/**
* Extract the classes in the given file
*
* copied from Composer\Autoload\GenerateClassMap::findClasses()
*
* @param string $path The file to check
*
* @return array The found classes
*/
private static function findClasses($path)
{
$traits = version_compare(PHP_VERSION, '5.4', '<') ? '' : '|trait';
try {
$contents = php_strip_whitespace($path);
} catch (\Exception $e) {
throw new \RuntimeException('Could not scan for classes inside '.$path.": \n".$e->getMessage(), 0, $e);
}
// return early if there is no chance of matching anything in this file
if (!preg_match('{\b(?:class|interface'.$traits.')\b}i', $contents)) {
return array();
}
// strip heredocs/nowdocs
$contents = preg_replace('{<<<\'?(\w+)\'?(?:\r\n|\n|\r)(?:.*?)(?:\r\n|\n|\r)\\1(?=\r\n|\n|\r|;)}s', 'null', $contents);
// strip strings
$contents = preg_replace('{"[^"\\\\]*(\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(\\\\.[^\'\\\\]*)*\'}', 'null', $contents);
// strip leading non-php code if needed
if (substr($contents, 0, 2) !== '<?') {
$contents = preg_replace('{^.+?<\?}s', '<?', $contents);
}
// strip non-php blocks in the file
$contents = preg_replace('{\?>.+<\?}s', '?><?', $contents);
// strip trailing non-php code if needed
$pos = strrpos($contents, '?>');
if (false !== $pos && false === strpos(substr($contents, $pos), '<?')) {
$contents = substr($contents, 0, $pos);
}
preg_match_all('{
(?:
\b(?<![\$:>])(?P<type>class|interface'.$traits.') \s+ (?P<name>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)
| \b(?<![\$:>])(?P<ns>namespace) (?P<nsname>\s+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?:\s*\\\\\s*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*)? \s*[\{;]
)
}ix', $contents, $matches);
$classes = array();
$namespace = '';
for ($i = 0, $len = count($matches['type']); $i < $len; $i++) {
if (!empty($matches['ns'][$i])) {
$namespace = str_replace(array(' ', "\t", "\r", "\n"), '', $matches['nsname'][$i]) . '\\';
} else {
$classes[] = ltrim($namespace . $matches['name'][$i], '\\');
}
}
return $classes;
}
}