TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed typos

This commit is contained in:
Pascal Borreli 2014-05-17 18:08:01 +02:00
parent c15471ef14
commit 459c8e0cfa
41 changed files with 77 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/config/cms.php
View File

@ -114,10 +114,10 @@ return array(
/*
|--------------------------------------------------------------------------
| Determines if the asset minifcation is enabled.
| Determines if the asset minification is enabled.
|--------------------------------------------------------------------------
|
| If the minifcation is enabled, combined assets are compressed (minified).
| If the minification is enabled, combined assets are compressed (minified).
| It is recommended to disable the minification during the development, and
| enable it in the production mode.
|

2
app/start/global.php
View File

@ -58,7 +58,7 @@ App::error(function(Exception $exception, $code)
|
| The "down" Artisan command gives you the ability to put an application
| into maintenance mode. Here, you will define what is displayed back
| to the user if maintenace mode is in effect for this application.
| to the user if maintenance mode is in effect for this application.
|
*/

2
modules/backend/behaviors/FormController.php
View File

@ -513,7 +513,7 @@ class FormController extends ControllerBehavior
/**
* Extend the query used for finding the form model. Extra conditions
* can be appied to the query, for example, $query->withTrashed();
* can be applied to the query, for example, $query->withTrashed();
* @param October\Rain\Database\Builder $query
* @return void
*/

18
modules/backend/behaviors/ListController.php
View File

@ -19,7 +19,7 @@ class ListController extends ControllerBehavior
/**
* @var array List definitions, keys for alias and value for configuration.
*/
private $listDefinintions;
private $listDefinitions;
/**
* @var string The primary list alias to use. Default: list
@ -61,18 +61,18 @@ class ListController extends ControllerBehavior
* Extract list definitions
*/
if (is_array($controller->listConfig)) {
$this->listDefinintions = $controller->listConfig;
$this->primaryDefinition = key($this->listDefinintions);
$this->listDefinitions = $controller->listConfig;
$this->primaryDefinition = key($this->listDefinitions);
}
else {
$this->listDefinintions = ['list' => $controller->listConfig];
$this->listDefinitions = ['list' => $controller->listConfig];
$this->primaryDefinition = 'list';
}
/*
* Build configuration
*/
$this->setConfig($this->listDefinintions[$this->primaryDefinition], $this->requiredConfig);
$this->setConfig($this->listDefinitions[$this->primaryDefinition], $this->requiredConfig);
}
/**
@ -81,7 +81,7 @@ class ListController extends ControllerBehavior
*/
public function makeLists()
{
foreach ($this->listDefinintions as $definition => $config) {
foreach ($this->listDefinitions as $definition => $config) {
$this->listWidgets[$definition] = $this->makeList($definition);
}
@ -94,10 +94,10 @@ class ListController extends ControllerBehavior
*/
public function makeList($definition = null)
{
if (!$definition || !isset($this->listDefinintions[$definition]))
if (!$definition || !isset($this->listDefinitions[$definition]))
$definition = $this->primaryDefinition;
$listConfig = $this->makeConfig($this->listDefinintions[$definition], $this->requiredConfig);
$listConfig = $this->makeConfig($this->listDefinitions[$definition], $this->requiredConfig);
/*
* Create the model
@ -197,7 +197,7 @@ class ListController extends ControllerBehavior
if (!count($this->listWidgets))
throw new SystemException(Lang::get('backend::lang.list.behavior_not_ready'));
if (!$definition || !isset($this->listDefinintions[$definition]))
if (!$definition || !isset($this->listDefinitions[$definition]))
$definition = $this->primaryDefinition;
$collection = [];

10
modules/backend/behaviors/RelationController.php
View File

@ -103,7 +103,7 @@ class RelationController extends ControllerBehavior
protected $manageMode;
/**
* @var int Primary id of an exisiting relation record.
* @var int Primary id of an existing relation record.
*/
protected $manageId;
@ -353,7 +353,7 @@ class RelationController extends ControllerBehavior
}
/**
* Returns the exisiting record IDs for the relation.
* Returns the existing record IDs for the relation.
*/
private function findExistingRelationIds($checkIds = null)
{
@ -391,7 +391,7 @@ class RelationController extends ControllerBehavior
if (($checkedIds = post('checked')) && is_array($checkedIds)) {
/*
* Remove exisiting relations from the array
* Remove existing relations from the array
*/
$existingIds = $this->findExistingRelationIds($checkedIds);
$checkedIds = array_diff($checkedIds, $existingIds);
@ -451,7 +451,7 @@ class RelationController extends ControllerBehavior
$saveData = $this->pivotWidget->getSaveData();
/*
* Check for exisiting relation
* Check for existing relation
*/
$existing = $this->relationObject->where('id', $foreignId)->count();
@ -569,7 +569,7 @@ class RelationController extends ControllerBehavior
}
/*
* Exclude exisiting relationships
* Exclude existing relationships
*/
if ($this->manageMode == 'pivot' || $this->manageMode == 'list') {
$widget->bindEvent('list.extendQueryBefore', function($host, $query) {

2
modules/backend/classes/Controller.php
View File

@ -213,7 +213,7 @@ class Controller extends Extendable
/**
* Invokes the current controller action without rendering a view,
* used by AJAX handler who may rely on the logic inside the aciton.
* used by AJAX handler who may rely on the logic inside the action.
*/
public function pageAction()
{

2
modules/backend/classes/ControllerBehavior.php
View File

@ -116,7 +116,7 @@ class ControllerBehavior extends ExtensionBase
* These methods could be defined in a controller to override a behavior default action.
* Such methods should be defined as public, to allow the behavior object to access it.
* By default public methods of a controller are considered as actions.
* To prevent this occurance, methods should be hidden by using this method.
* To prevent this occurrence, methods should be hidden by using this method.
* @param mixed $methodName Specifies a method name.
*/
protected function hideAction($methodName)

6
modules/backend/classes/FormField.php
View File

@ -140,7 +140,7 @@ class FormField
/**
* Sets a side of the field on a form.
* @param $value Specifies a side. Possible values: left, right, full
* @param string $value Specifies a side. Possible values: left, right, full
*/
public function span($value = 'full')
{
@ -150,7 +150,7 @@ class FormField
/**
* Sets a side of the field on a form.
* @param $value Specifies a size. Possible values: tiny, small, large, huge, giant
* @param string $value Specifies a size. Possible values: tiny, small, large, huge, giant
*/
public function size($value = 'large')
{
@ -180,7 +180,7 @@ class FormField
* Adds a text comment above or below the field.
* @param string $text Specifies a comment text.
* @param string $position Specifies a comment position.
* @param bool $commentHtml Set to true if you use HTML formatting in the comment
* @param bool $isHtml Set to true if you use HTML formatting in the comment
* Supported values are 'below' and 'above'
*/
public function comment($text, $position = 'below', $isHtml = false)

4
modules/backend/classes/WidgetBase.php
View File

@ -43,7 +43,7 @@ abstract class WidgetBase
/**
* Constructor
* @param Backend\Classes\Controller $controller
* @param array $configuration Proactive configuration definintion.
* @param array $configuration Proactive configuration definition.
* @return void
*/
public function __construct($controller, $configuration = [])
@ -200,7 +200,7 @@ abstract class WidgetBase
}
/**
* Retreieves a widget related key/value pair from session data.
* Retrieves a widget related key/value pair from session data.
* @param string $key Unique key for the data store.
* @param string $default A default value to use when value is not found.
* @return string

4
modules/backend/classes/WidgetManager.php
View File

@ -74,7 +74,7 @@ class WidgetManager
/**
* Makes a widget object with configuration set.
* @param $className A widget class name.
* @param string $className A widget class name.
* @param Controller $controller The Backend controller that spawned this widget.
* @param array $configuration Configuration values.
* @return WidgetBase The widget object.
@ -92,7 +92,7 @@ class WidgetManager
*/
if (!class_exists($className)) {
throw new SystemException(Lang::get('backend::lang.widget.not_registered', [
'name' => $name
'name' => $className
]));
}

3
modules/cms/classes/CmsCompoundObject.php
View File

@ -49,6 +49,7 @@ class CmsCompoundObject extends CmsObject
/**
* Loads the object from a file.
* @param \Cms\Classes\Theme $theme Specifies the theme the object belongs to.
* @param string $fileName Specifies the file name, with the extension.
* The file name can contain only alphanumeric symbols, dashes and dots.
* @return boolean Returns true if the object was successfully loaded. Otherwise returns false.
@ -152,7 +153,7 @@ class CmsCompoundObject extends CmsObject
}
/**
* Sets the PHP code content stirng.
* Sets the PHP code content string.
* @param string $value Specifies the PHP code string.
* @return \Cms\Classes\CmsCompoundObject Returns the object instance.
*/

6
modules/cms/classes/CmsException.php
View File

@ -57,9 +57,9 @@ class CmsException extends ApplicationException
}
/**
* Checks some conditions to confirm error has actually occured
* Checks some conditions to confirm error has actually occurred
* due to the CMS template code, not some external code. If the error
* has occured in external code, the function will return false. Otherwise return
* has occurred in external code, the function will return false. Otherwise return
* true and modify the exception by overriding it's content, line and message values
* to be accurate against a CMS object properties.
* @param \Exception $exception The exception to modify.
@ -152,7 +152,7 @@ class CmsException extends ApplicationException
return false;
}
/*
* Errors occuring the PHP code base class (Cms\Classes\CodeBase)
* Errors occurring the PHP code base class (Cms\Classes\CodeBase)
*/
else {
$trace = $exception->getTrace();

2
modules/cms/classes/CmsObject.php
View File

@ -211,7 +211,7 @@ class CmsObject
/**
* Helper for {{ page.id }} or {{ layout.id }} twig vars
* Returns a unqiue string for this object.
* Returns a unique string for this object.
* @return string
*/
public function getId()

6
modules/cms/classes/CombineAssets.php
View File

@ -89,7 +89,7 @@ class CombineAssets
$this->registerFilter('less', new \Assetic\Filter\LessphpFilter);
/*
* Minifcation filters
* Minification filters
*/
if ($this->useMinify) {
$this->registerFilter('js', new \Assetic\Filter\JSMinFilter);
@ -114,7 +114,7 @@ class CombineAssets
* Combines asset file references of a single type to produce
* a URL reference to the combined contents.
* @var array List of asset files.
* @var string File extension, used for asthetic purposes only.
* @var string File extension, used for aesthetic purposes only.
* @return string URL to contents.
*/
protected function prepareRequest(array $assets, $path = null)
@ -186,7 +186,7 @@ class CombineAssets
/**
* Returns the URL used for accessing the combined files.
* @param string $outputFileName A custom file name to use.
* @param string $outputFilename A custom file name to use.
* @return string
*/
protected function getCombinedUrl($outputFilename = 'undefined.css')

6
modules/cms/classes/Controller.php
View File

@ -166,8 +166,8 @@ class Controller extends BaseController
/*
* Execute page lifecycle
*/
if ($cycleReponse = $this->execPageCycle())
return $cycleReponse;
if ($cycleResponse = $this->execPageCycle())
return $cycleResponse;
/*
* Render the page
@ -566,7 +566,7 @@ class Controller extends BaseController
*
* @param mixed $name Specifies the Cms Page file name.
* @param array $parameters Route parameters to consider in the URL.
* @param bool $routePersistence By default the exisiting routing parameters will be included
* @param bool $routePersistence By default the existing routing parameters will be included
* when creating the URL, set to false to disable this feature.
* @return string
*/

6
modules/cms/classes/FileHelper.php
View File

@ -12,7 +12,7 @@ class FileHelper
* Validates a CMS object file or directory name.
* CMS object file names can contain only alphanumeric symbols, dashes, underscores and dots.
* Name can also begin with a component name, eg: MyComponent::filename.
* @param string $filePath Specifies a path to validate
* @param string $fileName Specifies a path to validate
* @return boolean Returns true if the file name is valid. Otherwise returns false.
*/
public static function validateName($fileName)
@ -22,7 +22,7 @@ class FileHelper
/**
* Validates whether a file has an allowed extension.
* @param string $filePath Specifies a path to validate
* @param string $fileName Specifies a path to validate
* @param array $allowedExtensions A list of allowed file extensions
* @param boolean $allowEmpty Determines whether the file extension could be empty.
* @return boolean Returns true if the file extension is valid. Otherwise returns false.
@ -40,6 +40,7 @@ class FileHelper
* Validates a CMS object path.
* CMS object directory and file names can contain only alphanumeric symbols, dashes and dots.
* CMS objects support only a single level of subdirectories.
* @param string $filePath Specifies a path to validate
* @param integer $maxNesting Specifies the maximum allowed nesting level
* @return boolean Returns true if the file name is valid. Otherwise returns false.
*/
@ -65,6 +66,7 @@ class FileHelper
/**
* Formats an INI file string from an array
* @param array $data Data to format.
* @param int $level Specifies the level of array value.
* @return string Returns the INI file string.
*/
public static function formatIniString($data, $level = 1)

2
modules/cms/classes/Router.php
View File

@ -56,7 +56,7 @@ class Router
/**
* Creates the router instance.
* @param \Cms\ClassesTheme $theme Specifies the theme being processed.
* @param \Cms\Classes\Theme $theme Specifies the theme being processed.
*/
public function __construct(Theme $theme)
{

8
modules/cms/classes/SectionParser.php
View File

@ -97,8 +97,8 @@ class SectionParser
/**
* Returns the line number of a found instance of CMS object section separator (==).
* @param $content Object content
* @param $instance Which instance to look for
* @param string $content Object content
* @param int $instance Which instance to look for
* @return int The line number the instance was found.
*/
private static function calculateLinePosition($content, $instance = 1)
@ -120,8 +120,8 @@ class SectionParser
* Pushes the starting line number forward since it is not always directly
* after the separator (==). There can be an opening tag or white space in between
* where the section really begins.
* @param $content Object content
* @param $startLine The calculated starting line from calculateLinePosition()
* @param string $content Object content
* @param int $startLine The calculated starting line from calculateLinePosition()
* @return int The adjusted line number.
*/
private static function adjustLinePosition($content, $startLine = -1)

8
modules/cms/classes/Theme.php
View File

@ -60,8 +60,8 @@ class Theme
/**
* Returns the active theme.
* By default the active theme is loaded from the cms.activeTheme parameter,
* but this behavior can be overriden by the cms.activeTheme event listeners.
* @return \Cms\Classes\Theme Returns the loaded theme objesct.
* but this behavior can be overridden by the cms.activeTheme event listeners.
* @return \Cms\Classes\Theme Returns the loaded theme object.
* If the theme doesn't exist, returns null.
*/
public static function getActiveTheme()
@ -86,10 +86,10 @@ class Theme
/**
* Returns the edit theme.
* By default the edit theme is loaded from the cms.editTheme parameter,
* but this behavior can be overriden by the cms.editTheme event listeners.
* but this behavior can be overridden by the cms.editTheme event listeners.
* If the edit theme is not defined in the configuration file, the active theme
* is returned.
* @return \Cms\Classes\Theme Returns the loaded theme objesct.
* @return \Cms\Classes\Theme Returns the loaded theme object.
* If the theme doesn't exist, returns null.
*/
public static function getEditTheme()

2
modules/cms/twig/ComponentNode.php
View File

@ -20,7 +20,7 @@ class ComponentNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

2
modules/cms/twig/ContentNode.php
View File

@ -20,7 +20,7 @@ class ContentNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

2
modules/cms/twig/DefaultNode.php
View File

@ -19,7 +19,7 @@ class DefaultNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

2
modules/cms/twig/Extension.php
View File

@ -222,7 +222,7 @@ class Extension extends Twig_Extension
* Looks up the URL for a supplied page and returns it relative to the website root.
* @param mixed $name Specifies the Cms Page file name.
* @param array $parameters Route parameters to consider in the URL.
* @param bool $routePersistence By default the exisiting routing parameters will be included
* @param bool $routePersistence By default the existing routing parameters will be included
* when creating the URL, set to false to disable this feature.
* @return string
*/

2
modules/cms/twig/FlashNode.php
View File

@ -21,7 +21,7 @@ class FlashNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

2
modules/cms/twig/FrameworkNode.php
View File

@ -19,7 +19,7 @@ class FrameworkNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

2
modules/cms/twig/Loader.php
View File

@ -18,7 +18,7 @@ class Loader implements Twig_LoaderInterface
/**
* Sets a CMS object to load the template from.
* @param \Cms\CmsObject $obj Specifies the CMS object.
* @param \Cms\Classes\CmsObject CmsO $obj Specifies the CMS object.
*/
public function setObject(CmsObject $obj)
{

2
modules/cms/twig/PageNode.php
View File

@ -19,7 +19,7 @@ class PageNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

2
modules/cms/twig/PartialNode.php
View File

@ -20,7 +20,7 @@ class PartialNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

2
modules/cms/twig/PlaceholderNode.php
View File

@ -24,7 +24,7 @@ class PlaceholderNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

2
modules/cms/twig/PlaceholderTokenParser.php
View File

@ -9,7 +9,7 @@ use Twig_TokenParser;
* <pre>
* {% placeholder head %}
*
* or - use default placeholer content
* or - use default placeholder content
*
* {% placeholder head %}
* <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"/>

2
modules/cms/twig/PutNode.php
View File

@ -20,7 +20,7 @@ class PutNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

2
modules/cms/twig/ScriptsNode.php
View File

@ -19,7 +19,7 @@ class ScriptsNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

2
modules/cms/twig/StylesNode.php
View File

@ -19,7 +19,7 @@ class StylesNode extends Twig_Node
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
* @param Twig_Compiler $compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{

3
modules/cms/widgets/AssetList.php
View File

@ -346,12 +346,11 @@ class AssetList extends WidgetBase
protected function getData()
{
$result = [];
$assetsPath = $this->getAssetsPath();
if (!file_exists($assetsPath) || !is_dir($assetsPath)) {
if (!@mkdir($assetsPath))
throw new ApplicationException(Lang::get('cms::lang.cms_object.error_creating_directory', ['name'=>$path]));
throw new ApplicationException(Lang::get('cms::lang.cms_object.error_creating_directory', ['name'=>$assetsPath]));
}
$searchTerm = Str::lower($this->getSearchTerm());

2
modules/system/ServiceProvider.php
View File

@ -32,7 +32,7 @@ class ServiceProvider extends ModuleServiceProvider
parent::register('system');
/*
* Reregister core providers
* Register core providers
*/
App::register('October\Rain\Config\ConfigServiceProvider');
App::register('October\Rain\Translation\TranslationServiceProvider');

2
modules/system/behaviors/SettingsModel.php
View File

@ -166,7 +166,7 @@ class SettingsModel extends ModelBehavior
}
/**
* Checks if a key is legitamite or should be added to
* Checks if a key is legitimate or should be added to
* the field value collection
*/
private function isKeyAllowed($key)

2
modules/system/classes/ErrorHandler.php
View File

@ -27,7 +27,7 @@ class ErrorHandler
/**
* All exceptions are piped through this method from the framework workflow. This method will mask
* any foriegn exceptions with a "scent" of the native application's exception, so it can render
* any foreign exceptions with a "scent" of the native application's exception, so it can render
* correctly when displayed on the error page.
* @param Exception $proposedException The exception candidate that has been thrown.
* @return View Object containing the error page.

6
modules/system/classes/ExceptionBase.php
View File

@ -209,7 +209,7 @@ class ExceptionBase extends Exception
* @return Array with stack information, each value will be an object with these values:
* id - The stack ID number.
* code - The class and function name being called.
* args - The arguements passed to the code function above.
* args - The arguments passed to the code function above.
* file - Reference to the file containing the called code.
* line - Reference to the line number of the file.
*/
@ -230,7 +230,7 @@ class ExceptionBase extends Exception
$args = null;
if (isset($event['args']) && count($event['args'])) {
$args = $this->formatStackArguements($event['args'], false);
$args = $this->formatStackArguments($event['args'], false);
}
$result[] = (object)[
@ -293,7 +293,7 @@ class ExceptionBase extends Exception
* @param array arguments A list of the function or method arguments
* @return string
*/
protected function formatStackArguements($arguments)
protected function formatStackArguments($arguments)
{
$argsArray = array();
foreach ($arguments as $argument) {

2
modules/system/classes/UpdateManager.php
View File

@ -594,7 +594,7 @@ class UpdateManager
}
/**
* Create a nonce based on milisecond time
* Create a nonce based on millisecond time
* @return int
*/
private function createNonce()

4
modules/system/classes/VersionManager.php
View File

@ -110,7 +110,7 @@ class VersionManager
}
/**
* Applys a single version update to a plugin.
* Applies a single version update to a plugin.
*/
protected function applyPluginUpdate($code, $version, $details)
{
@ -149,7 +149,7 @@ class VersionManager
*/
public function removePlugin($plugin)
{
$code = (is_string($plugin)) ? $code : $this->pluginManager->getIdentifier($plugin);
$code = (is_string($plugin)) ? $plugin : $this->pluginManager->getIdentifier($plugin);
if (!$this->hasVersionFile($code))
return false;

2
modules/system/traits/ConfigMaker.php
View File

@ -74,7 +74,7 @@ trait ConfigMaker
/**
* Makes a config object from an array, making the first level keys properties a new object.
* Property values are converted to camelCase and are not set if one already exists.
* @param string $configArray Config array.
* @param array $configArray Config array.
* @return stdObject The config object
*/
public function makeConfigFromArray($configArray = [])