hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

bb changes

Browse Source
This commit is contained in:
Jean-Yves Gaulier
2015-07-15 17:08:16 +02:00
parent 6b21f39d97
commit 0dd2bbfb3c
2 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/classes/caption/field.php
View File

@@ -15,20 +15,17 @@ use Doctrine\DBAL\Driver\Statement;
class caption_field implements cache_cacheableInterface class caption_field implements cache_cacheableInterface
{ {
/** /**
*
* @var databox_field * @var databox_field
*/ */
protected $databox_field; protected $databox_field;
/** /**
*
* @var caption_Field_Value[] * @var caption_Field_Value[]
*/ */
protected $values; protected $values;
/** /**
* * @var \record_adapter
* @var record
*/ */
protected $record; protected $record;
protected $app; protected $app;
@@ -36,7 +33,6 @@ class caption_field implements cache_cacheableInterface
protected static $localCache = []; protected static $localCache = [];
/** /**
*
* @param Application $app * @param Application $app
* @param databox_field $databox_field * @param databox_field $databox_field
* @param record_adapter $record * @param record_adapter $record
@@ -55,9 +51,7 @@ class caption_field implements cache_cacheableInterface
foreach ($rs as $row) { foreach ($rs as $row) {
$this->values[$row['id']] = new caption_Field_Value($this->app, $databox_field, $record, $row['id']); $this->values[$row['id']] = new caption_Field_Value($this->app, $databox_field, $record, $row['id']);
/** // Inconsistent, should not happen
* Inconsistent, should not happen
*/
if ( ! $databox_field->is_multi()) { if ( ! $databox_field->is_multi()) {
break; break;
} }
@@ -94,7 +88,6 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
*
* @return record_adapter * @return record_adapter
*/ */
public function get_record() public function get_record()
@@ -103,8 +96,7 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
* * @return bool
* @return boolean
*/ */
public function is_required() public function is_required()
{ {
@@ -112,8 +104,7 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
* * @return bool
* @return boolean
*/ */
public function is_multi() public function is_multi()
{ {
@@ -121,8 +112,7 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
* * @return bool
* @return boolean
*/ */
public function is_readonly() public function is_readonly()
{ {
@@ -130,7 +120,6 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
*
* @return caption_field * @return caption_field
*/ */
public function delete() public function delete()
@@ -144,7 +133,6 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
*
* @param array $values * @param array $values
* @param string $separator * @param string $separator
* @return string * @return string
@@ -172,7 +160,6 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
*
* @return \caption_Field_Value[] * @return \caption_Field_Value[]
*/ */
public function get_values() public function get_values()
@@ -181,7 +168,6 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
*
* @param int $meta_id * @param int $meta_id
* @return \caption_Field_Value * @return \caption_Field_Value
*/ */
@@ -220,7 +206,6 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
*
* @return string * @return string
*/ */
public function get_name() public function get_name()
@@ -229,7 +214,6 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
*
* @return int * @return int
*/ */
public function get_meta_struct_id() public function get_meta_struct_id()
@@ -238,8 +222,7 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
* * @return bool
* @return boolean
*/ */
public function is_indexable() public function is_indexable()
{ {
@@ -247,7 +230,6 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
*
* @return databox_field * @return databox_field
*/ */
public function get_databox_field() public function get_databox_field()
@@ -256,7 +238,6 @@ class caption_field implements cache_cacheableInterface
} }
/** /**
*
* @param string $serialized_value * @param string $serialized_value
* @param string $separator * @param string $separator
* @return array * @return array

2
tests/Alchemy/Tests/Phrasea/Utilities/String/StringHelperTest.php
View File

@@ -7,7 +7,7 @@ use Alchemy\Phrasea\Utilities\StringHelper;
/** /**
* @group unit * @group unit
*/ */
class CrLfNormalizerTest extends \PhraseanetTestCase class StringHelperTest extends \PhraseanetTestCase
{ {
/** /**
* @dataProvider provideStringsForCamelize * @dataProvider provideStringsForCamelize