Browse Source

Fixes #4526: fixed error caused by substr_compare length parameter doesn't accept null in PHP 5.4

tags/2.0.0-rc
Alexander Makarov 10 years ago
parent
commit
a38ba3ccbf
  1. 2
      extensions/gii/generators/crud/Generator.php
  2. 4
      extensions/gii/generators/model/Generator.php
  3. 2
      extensions/mongodb/gii/model/Generator.php
  4. 2
      extensions/sphinx/gii/model/Generator.php

2
extensions/gii/generators/crud/Generator.php

@ -374,7 +374,7 @@ class Generator extends \yii\gii\Generator
$labels[$name] = 'ID';
} else {
$label = Inflector::camel2words($name);
if (!empty($label) && substr_compare($label, ' id', -3, null, true) === 0) {
if (!empty($label) && substr_compare($label, ' id', -3, 3, true) === 0) {
$label = substr($label, 0, -3) . ' ID';
}
$labels[$name] = $label;

4
extensions/gii/generators/model/Generator.php

@ -197,7 +197,7 @@ class Generator extends \yii\gii\Generator
$labels[$column->name] = 'ID';
} else {
$label = Inflector::camel2words($column->name);
if (!empty($label) && substr_compare($label, ' id', -3, null, true)) {
if (!empty($label) && substr_compare($label, ' id', -3, 3, true)) {
$label = substr($label, 0, -3) . ' ID';
}
$labels[$column->name] = $label;
@ -429,7 +429,7 @@ class Generator extends \yii\gii\Generator
*/
protected function generateRelationName($relations, $className, $table, $key, $multiple)
{
if (!empty($key) && substr_compare($key, 'id', -2, null, true) === 0 && strcasecmp($key, 'id')) {
if (!empty($key) && substr_compare($key, 'id', -2, 2, true) === 0 && strcasecmp($key, 'id')) {
$key = rtrim(substr($key, 0, -2), '_');
}
if ($multiple) {

2
extensions/mongodb/gii/model/Generator.php

@ -183,7 +183,7 @@ class Generator extends \yii\gii\Generator
$label = 'ID';
} else {
$label = Inflector::camel2words($attribute);
if (substr_compare($label, ' id', -3, null, true) === 0) {
if (substr_compare($label, ' id', -3, 3, true) === 0) {
$label = substr($label, 0, -3) . ' ID';
}
}

2
extensions/sphinx/gii/model/Generator.php

@ -181,7 +181,7 @@ class Generator extends \yii\gii\Generator
$labels[$column->name] = 'ID';
} else {
$label = Inflector::camel2words($column->name);
if (substr_compare($label, ' id', -3, null, true) === 0) {
if (substr_compare($label, ' id', -3, 3, true) === 0) {
$label = substr($label, 0, -3) . ' ID';
}
$labels[$column->name] = $label;

Loading…
Cancel
Save