Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
48d04fbb
Commit
48d04fbb
authored
12 years ago
by
Alexander Kochetov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
!== array() => !empty()
parent
d7df7053
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
33 additions
and
33 deletions
+33
-33
YiiBase.php
framework/YiiBase.php
+1
-1
Controller.php
framework/base/Controller.php
+1
-1
Dictionary.php
framework/base/Dictionary.php
+2
-2
Vector.php
framework/base/Vector.php
+1
-1
Controller.php
framework/console/Controller.php
+4
-4
HelpController.php
framework/console/controllers/HelpController.php
+3
-3
ActiveQuery.php
framework/db/ActiveQuery.php
+1
-1
Query.php
framework/db/Query.php
+1
-1
QueryBuilder.php
framework/db/QueryBuilder.php
+1
-1
ArrayHelper.php
framework/helpers/base/ArrayHelper.php
+1
-1
Html.php
framework/helpers/base/Html.php
+7
-7
UrlManager.php
framework/web/UrlManager.php
+2
-2
UrlRule.php
framework/web/UrlRule.php
+2
-2
ActiveField.php
framework/widgets/ActiveField.php
+3
-3
ActiveForm.php
framework/widgets/ActiveForm.php
+2
-2
Menu.php
framework/widgets/Menu.php
+1
-1
No files found.
framework/YiiBase.php
View file @
48d04fbb
...
...
@@ -451,7 +451,7 @@ class YiiBase
}
$args
=
func_get_args
();
array_shift
(
$args
);
// remove $config
if
(
$config
!==
array
(
))
{
if
(
!
empty
(
$config
))
{
$args
[]
=
$config
;
}
return
$reflection
->
newInstanceArgs
(
$args
);
...
...
This diff is collapsed.
Click to expand it.
framework/base/Controller.php
View file @
48d04fbb
...
...
@@ -183,7 +183,7 @@ class Controller extends Component
}
}
if
(
$missing
!==
array
(
))
{
if
(
!
empty
(
$missing
))
{
throw
new
InvalidRequestException
(
Yii
::
t
(
'yii|Missing required parameters: {params}'
,
array
(
'{params}'
=>
implode
(
', '
,
$missing
),
)));
...
...
This diff is collapsed.
Click to expand it.
framework/base/Dictionary.php
View file @
48d04fbb
...
...
@@ -51,7 +51,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co
*/
public
function
__construct
(
$data
=
array
(),
$config
=
array
())
{
if
(
$data
!==
array
(
))
{
if
(
!
empty
(
$data
))
{
$this
->
copyFrom
(
$data
);
}
parent
::
__construct
(
$config
);
...
...
@@ -187,7 +187,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co
public
function
copyFrom
(
$data
)
{
if
(
is_array
(
$data
)
||
$data
instanceof
\Traversable
)
{
if
(
$this
->
_d
!==
array
(
))
{
if
(
!
empty
(
$this
->
_d
))
{
$this
->
removeAll
();
}
if
(
$data
instanceof
self
)
{
...
...
This diff is collapsed.
Click to expand it.
framework/base/Vector.php
View file @
48d04fbb
...
...
@@ -58,7 +58,7 @@ class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Counta
*/
public
function
__construct
(
$data
=
array
(),
$config
=
array
())
{
if
(
$data
!==
array
(
))
{
if
(
!
empty
(
$data
))
{
$this
->
copyFrom
(
$data
);
}
parent
::
__construct
(
$config
);
...
...
This diff is collapsed.
Click to expand it.
framework/console/Controller.php
View file @
48d04fbb
...
...
@@ -45,7 +45,7 @@ class Controller extends \yii\base\Controller
*/
public
function
runAction
(
$id
,
$params
=
array
())
{
if
(
$params
!==
array
(
))
{
if
(
!
empty
(
$params
))
{
$options
=
$this
->
globalOptions
();
foreach
(
$params
as
$name
=>
$value
)
{
if
(
in_array
(
$name
,
$options
,
true
))
{
...
...
@@ -69,7 +69,7 @@ class Controller extends \yii\base\Controller
*/
public
function
bindActionParams
(
$action
,
$params
)
{
if
(
$params
!==
array
(
))
{
if
(
!
empty
(
$params
))
{
$options
=
$this
->
globalOptions
();
foreach
(
$params
as
$name
=>
$value
)
{
if
(
in_array
(
$name
,
$options
,
true
))
{
...
...
@@ -81,7 +81,7 @@ class Controller extends \yii\base\Controller
$args
=
isset
(
$params
[
Request
::
ANONYMOUS_PARAMS
])
?
$params
[
Request
::
ANONYMOUS_PARAMS
]
:
array
();
unset
(
$params
[
Request
::
ANONYMOUS_PARAMS
]);
if
(
$params
!==
array
(
))
{
if
(
!
empty
(
$params
))
{
throw
new
Exception
(
Yii
::
t
(
'yii|Unknown options: {params}'
,
array
(
'{params}'
=>
implode
(
', '
,
array_keys
(
$params
)),
)));
...
...
@@ -105,7 +105,7 @@ class Controller extends \yii\base\Controller
}
}
if
(
$missing
!==
array
(
))
{
if
(
!
empty
(
$missing
))
{
throw
new
Exception
(
Yii
::
t
(
'yii|Missing required arguments: {params}'
,
array
(
'{params}'
=>
implode
(
', '
,
$missing
),
)));
...
...
This diff is collapsed.
Click to expand it.
framework/console/controllers/HelpController.php
View file @
48d04fbb
...
...
@@ -142,7 +142,7 @@ class HelpController extends Controller
protected
function
getHelp
()
{
$commands
=
$this
->
getCommands
();
if
(
$commands
!==
array
(
))
{
if
(
!
empty
(
$commands
))
{
echo
"The following commands are available:
\n\n
"
;
foreach
(
$commands
as
$command
)
{
echo
"*
$command
\n
"
;
...
...
@@ -172,7 +172,7 @@ class HelpController extends Controller
}
$actions
=
$this
->
getActions
(
$controller
);
if
(
$actions
!==
array
(
))
{
if
(
!
empty
(
$actions
))
{
echo
"
\n
SUB-COMMANDS
\n\n
"
;
$prefix
=
$controller
->
getUniqueId
();
foreach
(
$actions
as
$action
)
{
...
...
@@ -280,7 +280,7 @@ class HelpController extends Controller
}
$options
=
$this
->
getOptionHelps
(
$controller
);
if
(
$options
!==
array
(
))
{
if
(
!
empty
(
$options
))
{
echo
"
\n
OPTIONS
\n\n
"
;
echo
implode
(
"
\n\n
"
,
$options
)
.
"
\n\n
"
;
}
...
...
This diff is collapsed.
Click to expand it.
framework/db/ActiveQuery.php
View file @
48d04fbb
...
...
@@ -103,7 +103,7 @@ class ActiveQuery extends Query
{
$command
=
$this
->
createCommand
();
$rows
=
$command
->
queryAll
();
if
(
$rows
!==
array
(
))
{
if
(
!
empty
(
$rows
))
{
$models
=
$this
->
createModels
(
$rows
);
if
(
!
empty
(
$this
->
with
))
{
$this
->
populateRelations
(
$models
,
$this
->
with
);
...
...
This diff is collapsed.
Click to expand it.
framework/db/Query.php
View file @
48d04fbb
...
...
@@ -589,7 +589,7 @@ class Query extends \yii\base\Component
*/
public
function
addParams
(
$params
)
{
if
(
$params
!==
array
(
))
{
if
(
!
empty
(
$params
))
{
if
(
$this
->
params
===
null
)
{
$this
->
params
=
$params
;
}
else
{
...
...
This diff is collapsed.
Click to expand it.
framework/db/QueryBuilder.php
View file @
48d04fbb
...
...
@@ -777,7 +777,7 @@ class QueryBuilder extends \yii\base\Object
$parts
[]
=
$operand
;
}
}
if
(
$parts
!==
array
(
))
{
if
(
!
empty
(
$parts
))
{
return
'('
.
implode
(
")
$operator
("
,
$parts
)
.
')'
;
}
else
{
return
''
;
...
...
This diff is collapsed.
Click to expand it.
framework/helpers/base/ArrayHelper.php
View file @
48d04fbb
...
...
@@ -36,7 +36,7 @@ class ArrayHelper
{
$args
=
func_get_args
();
$res
=
array_shift
(
$args
);
while
(
$args
!==
array
(
))
{
while
(
!
empty
(
$args
))
{
$next
=
array_shift
(
$args
);
foreach
(
$next
as
$k
=>
$v
)
{
if
(
is_integer
(
$k
))
{
...
...
This diff is collapsed.
Click to expand it.
framework/helpers/base/Html.php
View file @
48d04fbb
...
...
@@ -324,7 +324,7 @@ class Html
$options
[
'action'
]
=
$action
;
$options
[
'method'
]
=
$method
;
$form
=
static
::
beginTag
(
'form'
,
$options
);
if
(
$hiddenInputs
!==
array
(
))
{
if
(
!
empty
(
$hiddenInputs
))
{
$form
.=
"
\n
"
.
implode
(
"
\n
"
,
$hiddenInputs
);
}
...
...
@@ -618,7 +618,7 @@ class Html
* is present, a hidden input will be generated so that if the radio button is not checked and is submitted,
* the value of this attribute will still be submitted to the server via the hidden input.
*
* The rest of the options will be rendered as the attributes of the resulting tag. The values will
* The rest of the options will be rendered as the attributes of the resulting tag. The values will
* be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
*
* @return string the generated radio button tag
...
...
@@ -647,7 +647,7 @@ class Html
* is present, a hidden input will be generated so that if the checkbox is not checked and is submitted,
* the value of this attribute will still be submitted to the server via the hidden input.
*
* The rest of the options will be rendered as the attributes of the resulting tag. The values will
* The rest of the options will be rendered as the attributes of the resulting tag. The values will
* be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
*
* @return string the generated checkbox tag
...
...
@@ -694,9 +694,9 @@ class Html
* - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
* except that the array keys represent the optgroup labels specified in $items.
*
* The rest of the options will be rendered as the attributes of the resulting tag. The values will
* The rest of the options will be rendered as the attributes of the resulting tag. The values will
* be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
*
*
* @return string the generated drop-down list tag
*/
public
static
function
dropDownList
(
$name
,
$selection
=
null
,
$items
=
array
(),
$options
=
array
())
...
...
@@ -737,9 +737,9 @@ class Html
* When this attribute is set, a hidden field will be generated so that if no option is selected in multiple
* mode, we can still obtain the posted unselect value.
*
* The rest of the options will be rendered as the attributes of the resulting tag. The values will
* The rest of the options will be rendered as the attributes of the resulting tag. The values will
* be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
*
*
* @return string the generated list box tag
*/
public
static
function
listBox
(
$name
,
$selection
=
null
,
$items
=
array
(),
$options
=
array
())
...
...
This diff is collapsed.
Click to expand it.
framework/web/UrlManager.php
View file @
48d04fbb
...
...
@@ -190,13 +190,13 @@ class UrlManager extends Component
if
(
$this
->
suffix
!==
null
)
{
$route
.=
$this
->
suffix
;
}
if
(
$params
!==
array
(
))
{
if
(
!
empty
(
$params
))
{
$route
.=
'?'
.
http_build_query
(
$params
);
}
return
rtrim
(
$baseUrl
,
'/'
)
.
'/'
.
$route
.
$anchor
;
}
else
{
$url
=
$baseUrl
.
'?'
.
$this
->
routeVar
.
'='
.
$route
;
if
(
$params
!==
array
(
))
{
if
(
!
empty
(
$params
))
{
$url
.=
'&'
.
http_build_query
(
$params
);
}
return
$url
;
...
...
This diff is collapsed.
Click to expand it.
framework/web/UrlRule.php
View file @
48d04fbb
...
...
@@ -144,7 +144,7 @@ class UrlRule extends Object
$this
->
_template
=
preg_replace
(
'/<(\w+):?([^>]+)?>/'
,
'<$1>'
,
$this
->
pattern
);
$this
->
pattern
=
'#^'
.
trim
(
strtr
(
$this
->
_template
,
$tr
),
'/'
)
.
'$#u'
;
if
(
$this
->
_routeParams
!==
array
(
))
{
if
(
!
empty
(
$this
->
_routeParams
))
{
$this
->
_routeRule
=
'#^'
.
strtr
(
$this
->
route
,
$tr2
)
.
'$#u'
;
}
}
...
...
@@ -275,7 +275,7 @@ class UrlRule extends Object
$url
.=
(
$this
->
suffix
===
null
?
$manager
->
suffix
:
$this
->
suffix
);
}
if
(
$params
!==
array
(
))
{
if
(
!
empty
(
$params
))
{
$url
.=
'?'
.
http_build_query
(
$params
);
}
return
$url
;
...
...
This diff is collapsed.
Click to expand it.
framework/widgets/ActiveField.php
View file @
48d04fbb
...
...
@@ -104,7 +104,7 @@ class ActiveField extends Component
public
function
begin
()
{
$options
=
$this
->
getClientOptions
();
if
(
$options
!==
array
(
))
{
if
(
!
empty
(
$options
))
{
$this
->
form
->
attributes
[
$this
->
attribute
]
=
$options
;
}
...
...
@@ -123,7 +123,7 @@ class ActiveField extends Component
return
Html
::
beginTag
(
$this
->
tag
,
$options
);
}
public
function
end
()
{
return
Html
::
endTag
(
$this
->
tag
);
...
...
@@ -143,7 +143,7 @@ class ActiveField extends Component
$validators
[]
=
$js
;
}
}
if
(
$validators
!==
array
(
))
{
if
(
!
empty
(
$validators
))
{
$options
[
'validate'
]
=
new
JsExpression
(
"function(attribute,value,messages){"
.
implode
(
''
,
$validators
)
.
'}'
);
}
}
...
...
This diff is collapsed.
Click to expand it.
framework/widgets/ActiveForm.php
View file @
48d04fbb
...
...
@@ -130,7 +130,7 @@ class ActiveForm extends Widget
*/
public
function
run
()
{
if
(
$this
->
attributes
!==
array
(
))
{
if
(
!
empty
(
$this
->
attributes
))
{
$id
=
$this
->
options
[
'id'
];
$options
=
Json
::
encode
(
$this
->
getClientOptions
());
$attributes
=
Json
::
encode
(
$this
->
attributes
);
...
...
@@ -197,7 +197,7 @@ class ActiveForm extends Widget
$options
[
'class'
]
.=
' '
.
$this
->
errorSummaryCssClass
;
}
if
(
$lines
!==
array
(
))
{
if
(
!
empty
(
$lines
))
{
$content
=
"<ul><li>"
.
implode
(
"</li>
\n
<li>"
,
$lines
)
.
"</li><ul>"
;
return
Html
::
tag
(
'div'
,
$header
.
$content
.
$footer
,
$options
);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
framework/widgets/Menu.php
View file @
48d04fbb
...
...
@@ -166,7 +166,7 @@ class Menu extends Widget
if
(
$this
->
itemCssClass
!==
null
)
{
$class
[]
=
$this
->
itemCssClass
;
}
if
(
$class
!==
array
(
))
{
if
(
!
empty
(
$class
))
{
if
(
empty
(
$options
[
'class'
]))
{
$options
[
'class'
]
=
implode
(
' '
,
$class
);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment