Skip to content
Browse files

Fixing prefix typo

  • Loading branch information...
1 parent d20b1d3 commit ddb0adba2bc2c7641ee24e7883f47012ab4ed6b9 @bermi bermi committed Oct 15, 2011
View
20 akelos_utils/generators/scaffold/scaffold_generator.php
@@ -26,8 +26,8 @@ function cast() {
$this->plural_name = AkInflector::pluralize($this->singular_name);
$this->singular_controller_name = AkInflector::underscore($this->controller_name);
- $this->module_preffix = AkInflector::underscore(substr($this->controller_class_name, 0, strrpos($this->controller_class_name, '_')));
- $this->module_preffix = empty($this->module_preffix) ? '' : DS.$this->module_preffix;
+ $this->module_prefix = AkInflector::underscore(substr($this->controller_class_name, 0, strrpos($this->controller_class_name, '_')));
+ $this->module_prefix = empty($this->module_prefix) ? '' : DS.$this->module_prefix;
$this->files = array(
@@ -36,19 +36,19 @@ function cast() {
* @todo Implement generic functional tests
*/
// 'functional_test.php' => AK_TEST_DIR.DS.'functional'.DS.'test_'.$this->controller_class_name.'.php',
- 'helper.php' => AK_HELPERS_DIR.$this->module_preffix.DS.trim($this->helper_var_name,'$').'.php',
+ 'helper.php' => AK_HELPERS_DIR.$this->module_prefix.DS.trim($this->helper_var_name,'$').'.php',
'layout' => AK_VIEWS_DIR.DS.'layouts'.DS.$this->singular_controller_name.'.tpl',
- 'view_add' => AK_VIEWS_DIR.$this->module_preffix.DS.$this->singular_controller_name.DS.'add.tpl',
- 'view_destroy' => AK_VIEWS_DIR.$this->module_preffix.DS.$this->singular_controller_name.DS.'destroy.tpl',
- 'view_edit' => AK_VIEWS_DIR.$this->module_preffix.DS.$this->singular_controller_name.DS.'edit.tpl',
- 'view_listing' => AK_VIEWS_DIR.$this->module_preffix.DS.$this->singular_controller_name.DS.'listing.tpl',
- 'view_show' => AK_VIEWS_DIR.$this->module_preffix.DS.$this->singular_controller_name.DS.'show.tpl',
- 'form' => AK_VIEWS_DIR.$this->module_preffix.DS.$this->singular_controller_name.DS.'_form.tpl',
+ 'view_add' => AK_VIEWS_DIR.$this->module_prefix.DS.$this->singular_controller_name.DS.'add.tpl',
+ 'view_destroy' => AK_VIEWS_DIR.$this->module_prefix.DS.$this->singular_controller_name.DS.'destroy.tpl',
+ 'view_edit' => AK_VIEWS_DIR.$this->module_prefix.DS.$this->singular_controller_name.DS.'edit.tpl',
+ 'view_listing' => AK_VIEWS_DIR.$this->module_prefix.DS.$this->singular_controller_name.DS.'listing.tpl',
+ 'view_show' => AK_VIEWS_DIR.$this->module_prefix.DS.$this->singular_controller_name.DS.'show.tpl',
+ 'form' => AK_VIEWS_DIR.$this->module_prefix.DS.$this->singular_controller_name.DS.'_form.tpl',
);
$this->user_actions = array();
foreach ((array)@$this->actions as $action){
- $this->user_actions[$action] = AK_VIEWS_DIR.$this->module_preffix.DS.$this->singular_controller_name.DS.$action.'.tpl';
+ $this->user_actions[$action] = AK_VIEWS_DIR.$this->module_prefix.DS.$this->singular_controller_name.DS.$action.'.tpl';
}
}
View
2 akelos_utils/generators/scaffold/sintags_templates/installer_fixture.tpl
@@ -1,7 +1,7 @@
<?php echo '<?php'?>
require_once(AK_BASE_DIR.DS.'app'.DS.'installers'.<?php
-echo !empty($module_preffix) ? "DS.'".trim($module_preffix,DS)."'." : ''
+echo !empty($module_prefix) ? "DS.'".trim($module_prefix,DS)."'." : ''
?>DS.substr(strrchr(__FILE__, DS), 1));
?>
View
2 akelos_utils/generators/scaffold/sintags_templates/model_unit_test.tpl
@@ -9,7 +9,7 @@
class <?php echo $model_name?>TestCase extends AkUnitTest
{
<?php
-echo !empty($module_preffix) ? ' var $module = \''.trim($module_preffix,DS).'\';' : ''
+echo !empty($module_prefix) ? ' var $module = \''.trim($module_prefix,DS).'\';' : ''
?>
function test_setup() {
View
8 akelos_utils/makelos/tasks/release/generate.task.php
@@ -114,16 +114,16 @@
}
}
-$preffix = $options['app_name'].'-'.$options['version'].($options['commit']?'-'.$options['revision']:'').$options['tag'];
+$prefix = $options['app_name'].'-'.$options['version'].($options['commit']?'-'.$options['revision']:'').$options['tag'];
foreach ($options['format'] as $format){
- $file_path = "{$options['path']}/$preffix";
+ $file_path = "{$options['path']}/$prefix";
if($format == 'tar' && empty($options['skip_gzip'])){
$file_name = $file_path.'.tar.gz';
- $command = "git archive --format=$format --prefix=$preffix/ {$options['revision']} | gzip > $file_name";
+ $command = "git archive --format=$format --prefix=$prefix/ {$options['revision']} | gzip > $file_name";
}else{
$file_name = $file_path.'.'.$format;
- $command = "git archive --format=$format --prefix=$preffix/ {$options['revision']} > $file_name";
+ $command = "git archive --format=$format --prefix=$prefix/ {$options['revision']} > $file_name";
}
if(!empty($options['checksum'])){
file_put_contents($file_path.'.checkum', md5_file($file_name));
View
4 akelos_utils/scripts/migrate.php
@@ -20,12 +20,12 @@
$file = AkConfig::getDir('app').DS.'installers'.DS.rtrim(join('/',array_map(array('AkInflector','underscore'), explode('/',$installer.'/'))),'/').'_installer.php';
-function ak_print_available_installers($files, $preffix = '')
+function ak_print_available_installers($files, $prefix = '')
{
foreach($files as $k => $file){
if(is_string($file)){
if(preg_match('/(.*)_installer\.php$/', $file, $match)){
- echo ' * '.$preffix.$match[1]."\n";
+ echo ' * '.$prefix.$match[1]."\n";
}
}else{
ak_print_available_installers($file, $k.'::');
View
2 test/akelos/active_support/cases/file_handling.php
@@ -96,7 +96,7 @@ public function Test_directory_delete() {
}
public function test_mime_type_detection() {
- // png is not in any RFC so we might want to check if it has a /x- preffix for non standard values
+ // png is not in any RFC so we might want to check if it has a /x- prefix for non standard values
$this->assertTrue(in_array(Ak::mime_content_type(AK_PUBLIC_DIR.DS.'images'.DS.'akelos_framework_logo.png'),array('image/png','image/x-png')));
$this->assertEqual(Ak::mime_content_type('C:\Folder\image.png'),'image/png');
}

0 comments on commit ddb0adb

Please sign in to comment.
Something went wrong with that request. Please try again.