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
0b2aafc7
Commit
0b2aafc7
authored
Mar 26, 2014
by
Carsten Brandt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed private / self in helpers
fixes #2886
parent
d774e7f1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
12 deletions
+6
-12
BaseMarkdown.php
framework/helpers/BaseMarkdown.php
+1
-1
BaseUrl.php
framework/helpers/BaseUrl.php
+1
-1
RateLimiter.php
framework/rest/RateLimiter.php
+1
-2
UploadedFile.php
framework/web/UploadedFile.php
+3
-8
No files found.
framework/helpers/BaseMarkdown.php
View file @
0b2aafc7
...
@@ -82,7 +82,7 @@ class BaseMarkdown
...
@@ -82,7 +82,7 @@ class BaseMarkdown
* @return \cebe\markdown\Parser
* @return \cebe\markdown\Parser
* @throws \yii\base\InvalidParamException when an undefined flavor is given.
* @throws \yii\base\InvalidParamException when an undefined flavor is given.
*/
*/
pr
ivate
static
function
getParser
(
$flavor
)
pr
otected
static
function
getParser
(
$flavor
)
{
{
/** @var \cebe\markdown\Markdown $parser */
/** @var \cebe\markdown\Markdown $parser */
if
(
!
isset
(
static
::
$flavors
[
$flavor
]))
{
if
(
!
isset
(
static
::
$flavors
[
$flavor
]))
{
...
...
framework/helpers/BaseUrl.php
View file @
0b2aafc7
...
@@ -108,7 +108,7 @@ class BaseUrl
...
@@ -108,7 +108,7 @@ class BaseUrl
* @return string normalized route suitable for UrlManager
* @return string normalized route suitable for UrlManager
* @throws InvalidParamException a relative route is given while there is no active controller
* @throws InvalidParamException a relative route is given while there is no active controller
*/
*/
pr
ivate
static
function
normalizeRoute
(
$route
)
pr
otected
static
function
normalizeRoute
(
$route
)
{
{
$route
=
(
string
)
$route
;
$route
=
(
string
)
$route
;
if
(
strncmp
(
$route
,
'/'
,
1
)
===
0
)
{
if
(
strncmp
(
$route
,
'/'
,
1
)
===
0
)
{
...
...
framework/rest/RateLimiter.php
View file @
0b2aafc7
...
@@ -8,7 +8,6 @@
...
@@ -8,7 +8,6 @@
namespace
yii\rest
;
namespace
yii\rest
;
use
yii\base\Component
;
use
yii\base\Component
;
use
yii\base\Action
;
use
yii\web\Request
;
use
yii\web\Request
;
use
yii\web\Response
;
use
yii\web\Response
;
use
yii\web\TooManyRequestsHttpException
;
use
yii\web\TooManyRequestsHttpException
;
...
@@ -37,7 +36,7 @@ class RateLimiter extends Component
...
@@ -37,7 +36,7 @@ class RateLimiter extends Component
* @param RateLimitInterface $user the current user
* @param RateLimitInterface $user the current user
* @param Request $request
* @param Request $request
* @param Response $response
* @param Response $response
* @param Action $action the action to be executed
* @param
\yii\base\
Action $action the action to be executed
* @throws TooManyRequestsHttpException if rate limit exceeds
* @throws TooManyRequestsHttpException if rate limit exceeds
*/
*/
public
function
check
(
$user
,
$request
,
$response
,
$action
)
public
function
check
(
$user
,
$request
,
$response
,
$action
)
...
...
framework/web/UploadedFile.php
View file @
0b2aafc7
...
@@ -56,6 +56,7 @@ class UploadedFile extends Object
...
@@ -56,6 +56,7 @@ class UploadedFile extends Object
*/
*/
public
$error
;
public
$error
;
/**
/**
* String output.
* String output.
* This is PHP magic method that returns string representation of an object.
* This is PHP magic method that returns string representation of an object.
...
@@ -80,7 +81,6 @@ class UploadedFile extends Object
...
@@ -80,7 +81,6 @@ class UploadedFile extends Object
public
static
function
getInstance
(
$model
,
$attribute
)
public
static
function
getInstance
(
$model
,
$attribute
)
{
{
$name
=
Html
::
getInputName
(
$model
,
$attribute
);
$name
=
Html
::
getInputName
(
$model
,
$attribute
);
return
static
::
getInstanceByName
(
$name
);
return
static
::
getInstanceByName
(
$name
);
}
}
...
@@ -95,7 +95,6 @@ class UploadedFile extends Object
...
@@ -95,7 +95,6 @@ class UploadedFile extends Object
public
static
function
getInstances
(
$model
,
$attribute
)
public
static
function
getInstances
(
$model
,
$attribute
)
{
{
$name
=
Html
::
getInputName
(
$model
,
$attribute
);
$name
=
Html
::
getInputName
(
$model
,
$attribute
);
return
static
::
getInstancesByName
(
$name
);
return
static
::
getInstancesByName
(
$name
);
}
}
...
@@ -108,8 +107,7 @@ class UploadedFile extends Object
...
@@ -108,8 +107,7 @@ class UploadedFile extends Object
*/
*/
public
static
function
getInstanceByName
(
$name
)
public
static
function
getInstanceByName
(
$name
)
{
{
$files
=
static
::
loadFiles
();
$files
=
self
::
loadFiles
();
return
isset
(
$files
[
$name
])
?
$files
[
$name
]
:
null
;
return
isset
(
$files
[
$name
])
?
$files
[
$name
]
:
null
;
}
}
...
@@ -124,7 +122,7 @@ class UploadedFile extends Object
...
@@ -124,7 +122,7 @@ class UploadedFile extends Object
*/
*/
public
static
function
getInstancesByName
(
$name
)
public
static
function
getInstancesByName
(
$name
)
{
{
$files
=
s
tatic
::
loadFiles
();
$files
=
s
elf
::
loadFiles
();
if
(
isset
(
$files
[
$name
]))
{
if
(
isset
(
$files
[
$name
]))
{
return
[
$files
[
$name
]];
return
[
$files
[
$name
]];
}
}
...
@@ -134,7 +132,6 @@ class UploadedFile extends Object
...
@@ -134,7 +132,6 @@ class UploadedFile extends Object
$results
[]
=
self
::
$_files
[
$key
];
$results
[]
=
self
::
$_files
[
$key
];
}
}
}
}
return
$results
;
return
$results
;
}
}
...
@@ -166,7 +163,6 @@ class UploadedFile extends Object
...
@@ -166,7 +163,6 @@ class UploadedFile extends Object
return
copy
(
$this
->
tempName
,
$file
);
return
copy
(
$this
->
tempName
,
$file
);
}
}
}
}
return
false
;
return
false
;
}
}
...
@@ -209,7 +205,6 @@ class UploadedFile extends Object
...
@@ -209,7 +205,6 @@ class UploadedFile extends Object
}
}
}
}
}
}
return
self
::
$_files
;
return
self
::
$_files
;
}
}
...
...
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