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
ffded7a1
Commit
ffded7a1
authored
Nov 15, 2013
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
array syntax fix.
parent
542477c3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
Progress.php
extensions/bootstrap/Progress.php
+1
-1
Mailer.php
extensions/swiftmailer/Mailer.php
+4
-4
AssetConverter.php
framework/yii/web/AssetConverter.php
+5
-5
BaseMessageTest.php
tests/unit/framework/mail/BaseMessageTest.php
+1
-1
No files found.
extensions/bootstrap/Progress.php
View file @
ffded7a1
...
@@ -48,7 +48,7 @@ use yii\helpers\Html;
...
@@ -48,7 +48,7 @@ use yii\helpers\Html;
* 'bars' => [
* 'bars' => [
* ['percent' => 30, 'options' => ['class' => 'bar-danger']],
* ['percent' => 30, 'options' => ['class' => 'bar-danger']],
* ['percent' => 30, 'label' => 'test', 'options' => ['class' => 'bar-success']],
* ['percent' => 30, 'label' => 'test', 'options' => ['class' => 'bar-success']],
* ['percent' => 35, 'options' =>
array
['class' => 'bar-warning']],
* ['percent' => 35, 'options' => ['class' => 'bar-warning']],
* ]
* ]
* ]);
* ]);
* ```
* ```
...
...
extensions/swiftmailer/Mailer.php
View file @
ffded7a1
...
@@ -17,9 +17,9 @@ use yii\mail\BaseMailer;
...
@@ -17,9 +17,9 @@ use yii\mail\BaseMailer;
* To use Mailer, you should configure it in the application configuration like the following,
* To use Mailer, you should configure it in the application configuration like the following,
*
*
* ~~~
* ~~~
* 'components' =>
array(
* 'components' =>
[
* ...
* ...
* 'email' =>
array(
* 'email' =>
[
* 'class' => 'yii\swiftmailer\Mailer',
* 'class' => 'yii\swiftmailer\Mailer',
* 'transport' => [
* 'transport' => [
* 'class' => 'Swift_SmtpTransport',
* 'class' => 'Swift_SmtpTransport',
...
@@ -29,9 +29,9 @@ use yii\mail\BaseMailer;
...
@@ -29,9 +29,9 @@ use yii\mail\BaseMailer;
* 'port' => '587',
* 'port' => '587',
* 'encryption' => 'tls',
* 'encryption' => 'tls',
* ],
* ],
*
)
,
*
]
,
* ...
* ...
*
)
,
*
]
,
* ~~~
* ~~~
*
*
* You may also skip the configuration of the [[transport]] property. In that case, the default
* You may also skip the configuration of the [[transport]] property. In that case, the default
...
...
framework/yii/web/AssetConverter.php
View file @
ffded7a1
...
@@ -74,11 +74,11 @@ class AssetConverter extends Component implements AssetConverterInterface
...
@@ -74,11 +74,11 @@ class AssetConverter extends Component implements AssetConverterInterface
'{from}'
=>
escapeshellarg
(
"
$basePath
/
$asset
"
),
'{from}'
=>
escapeshellarg
(
"
$basePath
/
$asset
"
),
'{to}'
=>
escapeshellarg
(
"
$basePath
/
$result
"
),
'{to}'
=>
escapeshellarg
(
"
$basePath
/
$result
"
),
]);
]);
$descriptor
=
array
(
$descriptor
=
[
1
=>
array
(
'pipe'
,
'w'
)
,
1
=>
[
'pipe'
,
'w'
]
,
2
=>
array
(
'pipe'
,
'w'
)
,
2
=>
[
'pipe'
,
'w'
]
,
)
;
]
;
$pipes
=
array
()
;
$pipes
=
[]
;
$proc
=
proc_open
(
$command
,
$descriptor
,
$pipes
,
$basePath
);
$proc
=
proc_open
(
$command
,
$descriptor
,
$pipes
,
$basePath
);
$stdout
=
stream_get_contents
(
$pipes
[
1
]);
$stdout
=
stream_get_contents
(
$pipes
[
1
]);
$stderr
=
stream_get_contents
(
$pipes
[
2
]);
$stderr
=
stream_get_contents
(
$pipes
[
2
]);
...
...
tests/unit/framework/mail/BaseMessageTest.php
View file @
ffded7a1
...
@@ -69,7 +69,7 @@ class BaseMessageTest extends TestCase
...
@@ -69,7 +69,7 @@ class BaseMessageTest extends TestCase
class
TestMailer
extends
BaseMailer
class
TestMailer
extends
BaseMailer
{
{
public
$messageClass
=
'yiiunit\framework\mail\TestMessage'
;
public
$messageClass
=
'yiiunit\framework\mail\TestMessage'
;
public
$sentMessages
=
array
()
;
public
$sentMessages
=
[]
;
protected
function
sendMessage
(
$message
)
protected
function
sendMessage
(
$message
)
{
{
...
...
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