chenx221/yii2-bootstrap5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8 from dicrtarasov/dicr-fix-activestaticcontrol

Browse Source 
fixed #6: BaseHtml::activeStaticControl value type
This commit is contained in:
simialbi 2021-08-16 09:51:43 +02:00 committed by GitHub
commit 437bb9e3ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ Yii Framework 2 bootstrap5 extension Change Log
2.0.2 under development 2.0.2 under development
----------------------- -----------------------
- Bug #6: yii\bootstrap5\BaseHtml::staticControl(): Argument #1 ($value) must be of type string, int given (dicrtarasov)
- Bug #9: fixed default ActiveField::hintOptions (dicrtarasov) - Bug #9: fixed default ActiveField::hintOptions (dicrtarasov)

7
src/BaseHtml.php
View File

@ -49,7 +49,6 @@ abstract class BaseHtml extends \yii\helpers\Html
public static function staticControl(string $value, array $options = []): string public static function staticControl(string $value, array $options = []): string
{ {
static::addCssClass($options, 'form-control-plaintext'); static::addCssClass($options, 'form-control-plaintext');
$value = (string)$value;
$options['readonly'] = true; $options['readonly'] = true;
return static::input('text', null, $value, $options); return static::input('text', null, $value, $options);
@ -64,7 +63,7 @@ abstract class BaseHtml extends \yii\helpers\Html
* @return string generated HTML * @return string generated HTML
* @see staticControl() * @see staticControl()
*/ */
public static function activeStaticControl(Model $model, string $attribute, $options = []): string public static function activeStaticControl(Model $model, string $attribute, array $options = []): string
{ {
if (isset($options['value'])) { if (isset($options['value'])) {
$value = $options['value']; $value = $options['value'];
@ -73,11 +72,11 @@ abstract class BaseHtml extends \yii\helpers\Html
$value = static::getAttributeValue($model, $attribute); $value = static::getAttributeValue($model, $attribute);
} }
return static::staticControl($value, $options); return static::staticControl((string)$value, $options);
} }
/** /**
* {@inheritdoc} * {@inheritDoc}
*/ */
public static function radioList($name, $selection = null, $items = [], $options = []): string public static function radioList($name, $selection = null, $items = [], $options = []): string
{ {

52
tests/ActiveFormTest.php
View File

@ -310,6 +310,58 @@ HTML;
$this->assertContainsWithoutLE($expected4, $out); $this->assertContainsWithoutLE($expected4, $out);
} }
public function testStaticControlRendering()
{
ActiveForm::$counter = 0;
ob_start();
$model = new User();
$model->setAttributes([
'id' => 1,
'firstName' => 'John',
'lastName' => 'Doe'
]);
$form = ActiveForm::begin([
'action' => '/some-action',
'layout' => ActiveForm::LAYOUT_DEFAULT
]);
echo $form->field($model, 'id')->staticControl();
echo $form->field($model, 'firstName')->staticControl();
echo $form->field($model, 'lastName')->staticControl();
echo $form->field($model, 'username')->staticControl();
ActiveForm::end();
$out = ob_get_clean();
$expected = <<<HTML
<div class="mb-3 field-user-id">
<label class="form-label" for="user-id">Id</label>
<input type="text" class="form-control-plaintext" value="1" readonly>
<div class="invalid-feedback"></div>
</div>
HTML;
$expected2 = <<<HTML
<div class="mb-3 field-user-firstname">
<label class="form-label" for="user-firstname">First Name</label>
<input type="text" class="form-control-plaintext" value="John" readonly>
<div class="invalid-feedback"></div>
</div>
HTML;
$expected3 = <<<HTML
<div class="mb-3 field-user-lastname">
<label class="form-label" for="user-lastname">Last Name</label>
<input type="text" class="form-control-plaintext" value="Doe" readonly>
<div class="invalid-feedback"></div>
</div>
HTML;
$this->assertContainsWithoutLE($expected, $out);
$this->assertContainsWithoutLE($expected2, $out);
$this->assertContainsWithoutLE($expected3, $out);
}
/** /**
* Fixes #128 * Fixes #128
* @see https://github.com/yiisoft/yii2-bootstrap5/issues/128 * @see https://github.com/yiisoft/yii2-bootstrap5/issues/128

3
tests/data/User.php
View File

@ -11,6 +11,7 @@ use yii\base\Model;
class User extends Model class User extends Model
{ {
public $id;
public $firstName; public $firstName;
public $lastName; public $lastName;
public $username; public $username;
@ -22,6 +23,8 @@ class User extends Model
public function rules() public function rules()
{ {
return [ return [
['id', 'integer'],
[['firstName', 'lastName'], 'string'],
['username', 'string', 'min' => 4], ['username', 'string', 'min' => 4],
['password', 'string', 'min' => 8, 'max' => '20'], ['password', 'string', 'min' => 8, 'max' => '20'],
[['username', 'password'], 'required'] [['username', 'password'], 'required']