Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
Silex
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
Silex
Commits
f10043eb
Commit
f10043eb
authored
Mar 25, 2011
by
Igor Wiedler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename flushControllerCollection to Application::flush()
parent
ce634a46
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
src/Silex/Application.php
src/Silex/Application.php
+2
-2
tests/Silex/Tests/ApplicationTest.php
tests/Silex/Tests/ApplicationTest.php
+1
-1
tests/Silex/Tests/FunctionalTest.php
tests/Silex/Tests/FunctionalTest.php
+1
-1
No files found.
src/Silex/Application.php
View file @
f10043eb
...
@@ -226,9 +226,9 @@ class Application extends HttpKernel implements EventSubscriberInterface
...
@@ -226,9 +226,9 @@ class Application extends HttpKernel implements EventSubscriberInterface
}
}
/**
/**
* Flush the controller collection
* Flush the controller collection
.
*/
*/
public
function
flush
ControllerCollection
()
public
function
flush
()
{
{
$this
->
controllerCollection
->
flush
();
$this
->
controllerCollection
->
flush
();
}
}
...
...
tests/Silex/Tests/ApplicationTest.php
View file @
f10043eb
...
@@ -94,7 +94,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
...
@@ -94,7 +94,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
$routeCollection
=
$application
->
getRouteCollection
();
$routeCollection
=
$application
->
getRouteCollection
();
$this
->
assertInstanceOf
(
'Symfony\Component\Routing\RouteCollection'
,
$routeCollection
);
$this
->
assertInstanceOf
(
'Symfony\Component\Routing\RouteCollection'
,
$routeCollection
);
$this
->
assertEquals
(
0
,
count
(
$routeCollection
->
all
()));
$this
->
assertEquals
(
0
,
count
(
$routeCollection
->
all
()));
$application
->
flush
ControllerCollection
();
$application
->
flush
();
$this
->
assertEquals
(
2
,
count
(
$routeCollection
->
all
()));
$this
->
assertEquals
(
2
,
count
(
$routeCollection
->
all
()));
}
}
}
}
tests/Silex/Tests/FunctionalTest.php
View file @
f10043eb
...
@@ -34,7 +34,7 @@ class FunctionalTest extends \PHPUnit_Framework_TestCase
...
@@ -34,7 +34,7 @@ class FunctionalTest extends \PHPUnit_Framework_TestCase
})
})
->
setRouteName
(
'foo_abc'
);
->
setRouteName
(
'foo_abc'
);
$application
->
flush
ControllerCollection
();
$application
->
flush
();
$routeCollection
=
$application
->
getRouteCollection
();
$routeCollection
=
$application
->
getRouteCollection
();
$this
->
assertInstanceOf
(
'Symfony\Component\Routing\Route'
,
$routeCollection
->
get
(
'homepage'
));
$this
->
assertInstanceOf
(
'Symfony\Component\Routing\Route'
,
$routeCollection
->
get
(
'homepage'
));
$this
->
assertInstanceOf
(
'Symfony\Component\Routing\Route'
,
$routeCollection
->
get
(
'foo_abc'
));
$this
->
assertInstanceOf
(
'Symfony\Component\Routing\Route'
,
$routeCollection
->
get
(
'foo_abc'
));
...
...
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