Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

code conventions

  • Loading branch information...
commit cd829350f2e2efb9e1572364ff85774471410e55 1 parent 713fa71
@dereuromark dereuromark authored
View
4 Console/Command/Task/AssetBuildTask.php
@@ -100,7 +100,7 @@ protected function _collectFiles($paths) {
}
/**
- * Scan each file for assetCompress helper calls. Only pull out the
+ * Scan each file for assetCompress helper calls. Only pull out the
* calls to the helper.
*
* @return void
@@ -226,7 +226,7 @@ protected function _buildFiles() {
if (strpos($target, ':hash') === 0) {
$target = md5(implode('_', $contents));
}
- $ext = $method == 'addScript' ? '.js' : '.css';
+ $ext = $method == 'addScript' ? '.js' : '.css';
$target = $this->_addExt($target, $ext);
$this->_Config->files($target, $contents);
$this->_buildTarget($target);
View
2  Lib/AssetCache.php
@@ -173,7 +173,7 @@ protected function _readTimestamp() {
}
/**
- * Get the final filename for a build. Resolves
+ * Get the final filename for a build. Resolves
* theme prefixes and timestamps.
*
* @param string $target The build target name.
View
2  Lib/AssetCompiler.php
@@ -45,7 +45,7 @@ public function generate($build) {
* @return int last modified time in UNIX seconds
*/
public function getLastModified($build) {
- $time = 0;
+ $time = 0;
foreach ($this->_getFilesList($build) as $file) {
if ($this->_Scanner->isRemote($file)) {
return time();
View
4 Lib/AssetFilter.php
@@ -28,7 +28,7 @@ public function input($filename, $content);
public function output($targetFile, $content);
/**
- * Gets settings for this filter. Will always include 'paths'
+ * Gets settings for this filter. Will always include 'paths'
* key which points at paths available for the type of asset being generated.
*
* @param array $settings Array of settings.
@@ -54,7 +54,7 @@ class AssetFilter implements AssetFilterInterface {
protected $_settings = array();
/**
- * Gets settings for this filter. Will always include 'paths'
+ * Gets settings for this filter. Will always include 'paths'
* key which points at paths available for the type of asset being generated.
*
* @param array $settings Array of settings.
View
2  Lib/AssetScanner.php
@@ -1,7 +1,7 @@
<?php
/**
* Used for dynamic build files where a set of searchPaths
- * are declared in the config file. This class allows you search through
+ * are declared in the config file. This class allows you search through
* those searchPaths and locate assets.
*
* @package asset_compress
View
4 Lib/Filter/CssMinFilter.php
@@ -4,8 +4,8 @@
/**
* CssMin filter.
*
- * Allows you to filter Css files through CssMin. You need to put CssMin in your application's
- * vendors directories. You can get it from http://code.google.com/p/cssmin/
+ * Allows you to filter Css files through CssMin. You need to put CssMin in your application's
+ * vendors directories. You can get it from http://code.google.com/p/cssmin/
*
* @package asset_compress
*/
View
4 Lib/Filter/JsMinFilter.php
@@ -4,8 +4,8 @@
/**
* JsMin filter.
*
- * Allows you to filter Javascript files through JsMin. You need to put JsMin in your application's
- * vendors directories. You can get it from http://github.com/rgrove/jsmin-php/
+ * Allows you to filter Javascript files through JsMin. You need to put JsMin in your application's
+ * vendors directories. You can get it from http://github.com/rgrove/jsmin-php/
*
* @package asset_compress
*/
View
2  Lib/Filter/ScssFilter.php
@@ -27,7 +27,7 @@ public function input($filename, $input) {
return $input;
}
$bin = $this->_settings['sass'] . ' ' . $filename;
- $return = $this->_runCmd($bin, '');
+ $return = $this->_runCmd($bin, '');
return $return;
}
View
6 Lib/Filter/TimestampImage.php
@@ -3,7 +3,7 @@
/**
* Adds timestamp querystrings to all background images in CSS files.
- * This helps with cachebusting CSS sprites. This is useful in
+ * This helps with cachebusting CSS sprites. This is useful in
* development, and deployment to ensure you always have the most recent
* images.
*
@@ -28,7 +28,7 @@ class TimestampImage extends AssetFilter {
protected $_filename;
/**
- * Input filter. Locates CSS background images relative to the
+ * Input filter. Locates CSS background images relative to the
* filename and gets the filemtime for the images.
*
* @param string $filename The file being processed
@@ -68,7 +68,7 @@ protected function _replace($matches) {
}
/**
- * Add timestamps to the given path. Will not change paths with
+ * Add timestamps to the given path. Will not change paths with
* querystrings, as they could have anything in them or be customized
* already.
*
View
2  Test/Case/Lib/Filter/SprocketsTest.php
@@ -100,7 +100,7 @@ function test(thing) {
}
/**
- * The unique dependency counter should persist across input() calls. Without that
+ * The unique dependency counter should persist across input() calls. Without that
* members of the same build will re-include their dependencies if multiple components rely on a single parent.
*
*/
View
12 View/Helper/AssetCompressHelper.php
@@ -69,7 +69,7 @@ public function __construct(View $View, $settings = array()) {
*
* @param string $name The dot separated config value to change ie. Css.searchPaths
* @param mixed $value The value to set the config to.
- * @return mixed Either the value being read or null. Null also is returned when reading things that don't exist.
+ * @return mixed Either the value being read or null. Null also is returned when reading things that don't exist.
*/
public function config($config = null) {
if ($config === null) {
@@ -135,7 +135,7 @@ protected function _includeViewJs() {
}
/**
- * Used to include runtime defined build files. To include build files defined in your
+ * Used to include runtime defined build files. To include build files defined in your
* ini file use script() or css().
*
* Calling this method will clear the asset caches.
@@ -168,8 +168,8 @@ public function includeAssets($raw = null) {
* #### Include all the files:
* `$this->AssetCompress->includeCss();`
*
- * @param string $name Name of the destination file to include. You can pass any number of strings in to
- * include multiple files. Leave null to include all files.
+ * @param string $name Name of the destination file to include. You can pass any number of strings in to
+ * include multiple files. Leave null to include all files.
* @return string A string containing the link tags
*/
public function includeCss() {
@@ -192,8 +192,8 @@ public function includeCss() {
* #### Include all the runtime files:
* `$this->AssetCompress->includeJs();`
*
- * @param string $name Name of the destination file to include. You can pass any number of strings in to
- * include multiple files. Leave null to include all files.
+ * @param string $name Name of the destination file to include. You can pass any number of strings in to
+ * include multiple files. Leave null to include all files.
* @return string A string containing the script tags.
*/
public function includeJs() {
Please sign in to comment.
Something went wrong with that request. Please try again.