it-blaster / translation-bundle

Behavior/ExtendedSluggableBehavior.php

Doc Comments +6 added lines

@@ -143,6 +143,9 @@ 
         return $script;
     }
 
+    /**
+     * @param string $script
+     */
     protected function addSlugSetter(&$script)
     {
         $script .= "
@@ -459,6 +462,9 @@ 
         return $script;
     }
 
+    /**
+     * @param string $script
+     */
     protected function addFilterBySlug(&$script)
     {
         $script .= "

Spacing +29 added lines, -29 removed lines

@@ -41,7 +41,7 @@ 
             ));
             // add a unique to column
             $unique = new \Unique($this->getColumnForParameter('slug_column'));
-            $unique->setName($this->getTable()->getCommonName() . '_slug');
+            $unique->setName($this->getTable()->getCommonName().'_slug');
             $unique->addColumn($this->getTable()->getColumn($this->getParameter('slug_column')));
             if ($this->getParameter('scope_column')) {
                 $unique->addColumn($this->getTable()->getColumn($this->getParameter('scope_column')));
@@ -57,7 +57,7 @@ 
      */
     protected function getColumnGetter()
     {
-        return 'get' . $this->getColumnForParameter('slug_column')->getPhpName();
+        return 'get'.$this->getColumnForParameter('slug_column')->getPhpName();
     }
 
     /**
@@ -67,7 +67,7 @@ 
      */
     protected function getColumnSetter()
     {
-        return 'set' . $this->getColumnForParameter('slug_column')->getPhpName();
+        return 'set'.$this->getColumnForParameter('slug_column')->getPhpName();
     }
 
     /**
@@ -99,7 +99,7 @@ 
                     throw new \InvalidArgumentException(sprintf('The pattern %s is invalid  the column %s is not found', $pattern, $match));
                 }
                 $columnConst = $builder->getColumnConstant($column);
-                $script .= "\$this->isColumnModified($columnConst)" . ($key < $count - 1 ? " || " : "");
+                $script .= "\$this->isColumnModified($columnConst)".($key < $count - 1 ? " || " : "");
             }
 
             $script .= ") {
@@ -150,11 +150,11 @@ 
  * Wrap the setter for slug value
  *
  * @param   string
- * @return  " . $this->getTable()->getPhpName() . "
+ * @return  " . $this->getTable()->getPhpName()."
  */
 public function setSlug(\$v)
 {
-    return \$this->" . $this->getColumnSetter() . "(\$v);
+    return \$this->" . $this->getColumnSetter()."(\$v);
 }
 ";
     }
@@ -169,7 +169,7 @@ 
  */
 public function getSlug()
 {
-    return \$this->" . $this->getColumnGetter() . "();
+    return \$this->" . $this->getColumnGetter()."();
 }
 ";
     }
@@ -204,10 +204,10 @@ 
 
         $primary_string = $this->getParameter('primary_string');
         $i18n_languages = $this->getSlugLocales();
-        $primary_string_column =  count($i18n_languages) ? $primary_string : $this->getColumnForParameter('primary_string');
+        $primary_string_column = count($i18n_languages) ? $primary_string : $this->getColumnForParameter('primary_string');
         $get_primary_string = 'get'.(count($i18n_languages) ? $this->CamelCase($primary_string) : $primary_string_column->getPhpName());
 
-        if(!$primary_string_column) {
+        if (!$primary_string_column) {
             $this->exceptionError('Not found column "'.$primary_string.'" in table '.$this->getTable()->getName());
         }
 
@@ -223,9 +223,9 @@ 
         if (count($i18n_languages)) {
             $languages = 'array(';
             foreach ($i18n_languages as $lang) {
-                $languages.='"'.$lang.'",';
+                $languages .= '"'.$lang.'",';
             }
-            $languages.=')';
+            $languages .= ')';
 
             $toSlug .= '
         $to_string = $this->isNew() ? "Новая запись" : "";
@@ -260,7 +260,7 @@ 
 {
     ";
         if ($pattern) {
-            $script .= "return '" . str_replace(array('{', '}'), array('\' . $this->cleanupSlugPart($this->get', '()) . \''), $pattern) . "';";
+            $script .= "return '".str_replace(array('{', '}'), array('\' . $this->cleanupSlugPart($this->get', '()) . \''), $pattern)."';";
         } else {
             $script .= "return \$this->cleanupSlugPart(\$this->toSlug());";
         }
@@ -282,7 +282,7 @@ 
  * @param     string \$replacement the separator used by slug
  * @return    string               the slugified text
  */
-protected static function cleanupSlugPart(\$slug, \$replacement = '" . $this->getParameter('replacement') . "')
+protected static function cleanupSlugPart(\$slug, \$replacement = '" . $this->getParameter('replacement')."')
 {
     \$slug = strtr(\$slug, array(
         'А' => 'A',  'Б' => 'B',  'В' => 'V',    'Г' => 'G',    'Д' => 'D', 'Е' => 'E', 'Ё' => 'E',  'Ж' => 'ZH',
@@ -312,7 +312,7 @@ 
     \$slug = str_replace(array('\'', '`', '^'), '', \$slug);
 
     // replace non letter or digits with separator
-    \$slug = preg_replace('" . $this->getParameter('replace_pattern') . "', \$replacement, \$slug);
+    \$slug = preg_replace('" . $this->getParameter('replace_pattern')."', \$replacement, \$slug);
 
     // trim
     \$slug = trim(\$slug, \$replacement);
@@ -363,7 +363,7 @@ 
  * @param    int    \$alreadyExists   false for the first try, true for the second, and take the high count + 1
  * @return   string                   the unique slug
  */
-protected function makeSlugUnique(\$slug, \$separator = '" . $this->getParameter('separator') . "', \$alreadyExists = false)
+protected function makeSlugUnique(\$slug, \$separator = '" . $this->getParameter('separator')."', \$alreadyExists = false)
 {";
         $getter = $this->getColumnGetter();
         $script .= "
@@ -375,7 +375,7 @@ 
         if (null == $this->getParameter('slug_pattern')) {
             $script .= "
 
-        \$count = " . $this->builder->getStubQueryBuilder()->getClassname() . "::create()
+        \$count = " . $this->builder->getStubQueryBuilder()->getClassname()."::create()
             ->filterBySlug(\$this->$getter())
             ->filterByPrimaryKey(\$this->getPrimaryKey())
         ->count();
@@ -388,23 +388,23 @@ 
         $script .= "
     }
 
-     \$query = " . $this->builder->getStubQueryBuilder()->getClassname() . "::create('q')
+     \$query = " . $this->builder->getStubQueryBuilder()->getClassname()."::create('q')
     ";
         $platform = $this->getTable()->getDatabase()->getPlatform();
         if ($platform instanceof \PgsqlPlatform) {
-            $script .= "->where('q." . $this->getColumnForParameter('slug_column')->getPhpName() . " ' . (\$alreadyExists ? '~*' : '=') . ' ?', \$alreadyExists ? '^' . \$slug2 . '[0-9]+$' : \$slug2)";
+            $script .= "->where('q.".$this->getColumnForParameter('slug_column')->getPhpName()." ' . (\$alreadyExists ? '~*' : '=') . ' ?', \$alreadyExists ? '^' . \$slug2 . '[0-9]+$' : \$slug2)";
         } elseif ($platform instanceof \MssqlPlatform) {
-            $script .= "->where('q." . $this->getColumnForParameter('slug_column')->getPhpName() . " ' . (\$alreadyExists ? 'like' : '=') . ' ?', \$alreadyExists ? '^' . \$slug2 . '[0-9]+$' : \$slug2)";
+            $script .= "->where('q.".$this->getColumnForParameter('slug_column')->getPhpName()." ' . (\$alreadyExists ? 'like' : '=') . ' ?', \$alreadyExists ? '^' . \$slug2 . '[0-9]+$' : \$slug2)";
         } elseif ($platform instanceof \OraclePlatform) {
-            $script .= "->where((\$alreadyExists ? 'REGEXP_LIKE(' : '') . 'q." . $this->getColumnForParameter('slug_column')->getPhpName() . " ' . (\$alreadyExists ? ',' : '=') . ' ?' . (\$alreadyExists ? ')' : ''), \$alreadyExists ? '^' . \$slug2 . '[0-9]+$' : \$slug2)";
+            $script .= "->where((\$alreadyExists ? 'REGEXP_LIKE(' : '') . 'q.".$this->getColumnForParameter('slug_column')->getPhpName()." ' . (\$alreadyExists ? ',' : '=') . ' ?' . (\$alreadyExists ? ')' : ''), \$alreadyExists ? '^' . \$slug2 . '[0-9]+$' : \$slug2)";
         } else {
-            $script .= "->where('q." . $this->getColumnForParameter('slug_column')->getPhpName() . " ' . (\$alreadyExists ? 'REGEXP' : '=') . ' ?', \$alreadyExists ? '^' . \$slug2 . '[0-9]+$' : \$slug2)";
+            $script .= "->where('q.".$this->getColumnForParameter('slug_column')->getPhpName()." ' . (\$alreadyExists ? 'REGEXP' : '=') . ' ?', \$alreadyExists ? '^' . \$slug2 . '[0-9]+$' : \$slug2)";
         }
 
-        $script .="->prune(\$this)";
+        $script .= "->prune(\$this)";
 
         if ($this->getParameter('scope_column')) {
-            $scopeGetter = 'get' . $this->getColumnForParameter('scope_column')->getPhpName();
+            $scopeGetter = 'get'.$this->getColumnForParameter('scope_column')->getPhpName();
             $script .= "
             ->filterBy('{$this->getColumnForParameter('scope_column')->getPhpName()}', \$this->{$scopeGetter}())";
         }
@@ -427,8 +427,8 @@ 
 
     // Already exists
     \$object = \$query
-        ->addDescendingOrderByColumn('LENGTH(" . $this->getColumnForParameter('slug_column')->getName() . ")')
-        ->addDescendingOrderByColumn('" . $this->getColumnForParameter('slug_column')->getName() . "')
+        ->addDescendingOrderByColumn('LENGTH(" . $this->getColumnForParameter('slug_column')->getName().")')
+        ->addDescendingOrderByColumn('" . $this->getColumnForParameter('slug_column')->getName()."')
     ->findOne();
 
     // First duplicate slug
@@ -436,7 +436,7 @@ 
         return \$slug2 . '1';
     }
 
-    \$slugNum = substr(\$object->" . $getter . "(), strlen(\$slug) + 1);
+    \$slugNum = substr(\$object->" . $getter."(), strlen(\$slug) + 1);
     if ('0' === \$slugNum[0]) {
         \$slugNum[0] = 1;
     }
@@ -467,11 +467,11 @@ 
  *
  * @param     string \$slug The value to use as filter.
  *
- * @return    " . $this->builder->getStubQueryBuilder()->getClassname() . " The current query, for fluid interface
+ * @return    " . $this->builder->getStubQueryBuilder()->getClassname()." The current query, for fluid interface
  */
 public function filterBySlug(\$slug)
 {
-    return \$this->addUsingAlias(" . $this->builder->getColumnConstant($this->getColumnForParameter('slug_column')) . ", \$slug, Criteria::EQUAL);
+    return \$this->addUsingAlias(" . $this->builder->getColumnConstant($this->getColumnForParameter('slug_column')).", \$slug, Criteria::EQUAL);
 }
 ";
     }
@@ -485,7 +485,7 @@ 
  * @param     string \$slug The value to use as filter.
  * @param     PropelPDO \$con The optional connection object
  *
- * @return    " . $this->builder->getStubObjectBuilder()->getClassname() . " the result, formatted by the current formatter
+ * @return    " . $this->builder->getStubObjectBuilder()->getClassname()." the result, formatted by the current formatter
  */
 public function findOneBySlug(\$slug, \$con = null)
 {

Behavior/TranslationBehavior.php

Doc Comments +2 added lines, -2 removed lines

@@ -193,7 +193,7 @@ 
      * Перевод из венгерского стиля в CamelCase
      *
      * @param $name
-     * @return mixed
+     * @return string
      */
     protected function CamelCase($name)
     {
@@ -279,7 +279,7 @@ 
     /**
      * Выкидываем эксепшн с ошибкой
      *
-     * @param $error
+     * @param string $error
      * @throws \Exception
      */
     protected function exceptionError($error)

Spacing +9 added lines, -9 removed lines

@@ -27,9 +27,9 @@ 
         $locales = $this->getLocales();
         $langs = "array(";
         foreach ($locales as $locale) {
-            $langs.='"'.$locale.'",';
+            $langs .= '"'.$locale.'",';
         }
-        $langs.=')';
+        $langs .= ')';
 
         $script .= '
 /**
@@ -64,10 +64,10 @@ 
     {
         $primary_string = $this->getParameter('primary_string');
         $i18n_languages = $this->getLocales();
-        $primary_string_column =  count($i18n_languages) ? $primary_string : $this->getColumnForParameter('primary_string');
+        $primary_string_column = count($i18n_languages) ? $primary_string : $this->getColumnForParameter('primary_string');
         $get_primary_string = 'get'.(count($i18n_languages) ? $this->CamelCase($primary_string) : $primary_string_column->getPhpName());
 
-        if(!$primary_string_column) {
+        if (!$primary_string_column) {
             $this->exceptionError('Not found column "'.$primary_string.'" in table '.$this->getTable()->getName());
         }
 
@@ -84,9 +84,9 @@ 
         if (count($i18n_languages)) {
             $languages = 'array(';
             foreach ($i18n_languages as $lang) {
-                $languages.='"'.$lang.'",';
+                $languages .= '"'.$lang.'",';
             }
-            $languages.=')';
+            $languages .= ')';
 
             $toString .= '
         $to_string = $this->isNew() ? "New object" : "";
@@ -243,7 +243,7 @@ 
         $currentTable = $this->getTable();
         $db = $currentTable->getDatabase();
 
-        $i18nTableName = $currentTable->getName() . '_i18n';
+        $i18nTableName = $currentTable->getName().'_i18n';
         $i18nTable = $db->getTable($i18nTableName);
         if (!$i18nTable) {
             $this->exceptionError('Table '.$i18nTableName.' not found');
@@ -265,13 +265,13 @@ 
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, \'left join\', \'right join\', \'inner join\'. Defaults to left join.
      *
-     * @return    \\' . $builder->getNewStubQueryBuilder($i18nTable)->getFullyQualifiedClassname() . ' A secondary query class using the current class as primary query
+     * @return    \\' . $builder->getNewStubQueryBuilder($i18nTable)->getFullyQualifiedClassname().' A secondary query class using the current class as primary query
      */
     public function useI18nQuery($locale = \'ru\', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         return $this
             ->joinI18n($locale, $relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : \''. $builder->getRefFKPhpNameAffix($foreignKey) .'\', \'\\'. $builder->getNewStubQueryBuilder($i18nTable)->getFullyQualifiedClassname() .'\');
+            ->useQuery($relationAlias ? $relationAlias : \''. $builder->getRefFKPhpNameAffix($foreignKey).'\', \'\\'.$builder->getNewStubQueryBuilder($i18nTable)->getFullyQualifiedClassname().'\');
     }';
         return $script;
     }

Behavior/TranslationModelBehavior.php

Doc Comments +3 added lines

@@ -37,6 +37,9 @@
         return $script;
     }
 
+    /**
+     * @param string $script
+     */
     public function getFieldTranslation(&$script)
     {
         $locales = $this->getContainer()->getParameter("it_blaster_translation.locales");

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     {
         $this->builder = $builder;
         $script = '';
-        $this->getFieldTranslation($script);    //методы переводов указанного поля
+        $this->getFieldTranslation($script); //методы переводов указанного поля
 
         return $script;
     }

Model/TranslationPeer.php

Spacing +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
 
         foreach ($translation_list_en as $id => $translation_item) {
             $result[$translation_item['alias']] = isset($translation_list_locale[$id]) && $translation_list_locale[$id] ?
-                $translation_list_locale[$id] :
-                ($translation_item['title'] ? $translation_item['title'] : $translation_item['alias']);
+                $translation_list_locale[$id] : ($translation_item['title'] ? $translation_item['title'] : $translation_item['alias']);
         }
 
         return $result;

Model/Translation.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     public function getAliasShort()
     {
         $alias = $this->getAlias();
-        if (mb_strlen($alias, "UTF-8")>26) {
+        if (mb_strlen($alias, "UTF-8") > 26) {
             $alias = mb_substr($alias, 0, 26, "utf-8")."...";
         }
         return $alias;

Behavior/ExtendedI18nBehavior.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
         $table = $this->getTable();
         $primary_string = $this->getParameter('primary_string');
 
-        if(!$primary_string) {
+        if (!$primary_string) {
             $this->exceptionError('Need set parameter "primary_string" in table '.$table->getName());
         }
 
-        if(!$table->hasColumn($primary_string)) {
+        if (!$table->hasColumn($primary_string)) {
             $this->exceptionError('Not found column "'.$primary_string.'" in table '.$table->getName());
         }
     }

Translation/Dumper/PhpDumper.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
         $this->writer
             ->reset()
             ->writeln('<?php')
-            ->writeln('return \ItBlaster\TranslationBundle\Model\TranslationPeer::getListForLocale("' . $this->locale . '");')
+            ->writeln('return \ItBlaster\TranslationBundle\Model\TranslationPeer::getListForLocale("'.$this->locale.'");')
             ->indent();
         $this->dumpStructureRecursively($structure);
 
@@ -92,7 +92,7 @@ 
                     if (!isset($translation_strings[$locale][$k])) {
                         /** @var Translation $trans_obj */
                         $trans_obj = $translation_strings['en'][$k];
-                        $this->setParamsTransObj($trans_obj,$locale,$k);
+                        $this->setParamsTransObj($trans_obj, $locale, $k);
                     }
                 }
             }
@@ -109,7 +109,7 @@ 
      * @param $locale
      * @param string $title
      */
-    private function setParamsTransObj(&$trans_obj, $locale, $alias, $title='')
+    private function setParamsTransObj(&$trans_obj, $locale, $alias, $title = '')
     {
         $trans_obj
             ->setAlias($alias)

Admin/TranslationAdmin.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
             'dev' => $app_dir.'/cache/dev/translations/',
             'prod' => $app_dir.'/cache/prod/translations/',
         );
-        foreach($cache_dirs as $cache_dir) {
+        foreach ($cache_dirs as $cache_dir) {
             if (is_dir($cache_dir)) {
                 $files = glob($cache_dir."*.*");
                 if (count($files)) {