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
816f4591
Commit
816f4591
authored
Feb 26, 2018
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed obsolete code
parent
63851cc6
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
77 deletions
+11
-77
src/Silex/Provider/AssetServiceProvider.php
src/Silex/Provider/AssetServiceProvider.php
+0
-4
src/Silex/Provider/MonologServiceProvider.php
src/Silex/Provider/MonologServiceProvider.php
+1
-12
src/Silex/Provider/TwigServiceProvider.php
src/Silex/Provider/TwigServiceProvider.php
+1
-1
tests/Silex/Tests/ApplicationTest.php
tests/Silex/Tests/ApplicationTest.php
+0
-5
tests/Silex/Tests/Provider/AssetServiceProviderTest.php
tests/Silex/Tests/Provider/AssetServiceProviderTest.php
+0
-6
tests/Silex/Tests/Provider/FormServiceProviderTest.php
tests/Silex/Tests/Provider/FormServiceProviderTest.php
+9
-43
tests/Silex/Tests/Provider/TwigServiceProviderTest.php
tests/Silex/Tests/Provider/TwigServiceProviderTest.php
+0
-6
No files found.
src/Silex/Provider/AssetServiceProvider.php
View file @
816f4591
...
@@ -72,10 +72,6 @@ class AssetServiceProvider implements ServiceProviderInterface
...
@@ -72,10 +72,6 @@ class AssetServiceProvider implements ServiceProviderInterface
}
}
if
(
$jsonManifestPath
)
{
if
(
$jsonManifestPath
)
{
if
(
!
class_exists
(
'Symfony\Component\Asset\VersionStrategy\JsonManifestVersionStrategy'
))
{
throw
new
\RuntimeException
(
'You must require symfony/asset >= 3.3 to use JSON manifest version strategy.'
);
}
return
new
JsonManifestVersionStrategy
(
$jsonManifestPath
);
return
new
JsonManifestVersionStrategy
(
$jsonManifestPath
);
}
}
...
...
src/Silex/Provider/MonologServiceProvider.php
View file @
816f4591
...
@@ -19,7 +19,6 @@ use Monolog\Handler;
...
@@ -19,7 +19,6 @@ use Monolog\Handler;
use
Monolog\ErrorHandler
;
use
Monolog\ErrorHandler
;
use
Silex\Application
;
use
Silex\Application
;
use
Silex\Api\BootableProviderInterface
;
use
Silex\Api\BootableProviderInterface
;
use
Symfony\Bridge\Monolog\Handler\DebugHandler
;
use
Symfony\Bridge\Monolog\Handler\FingersCrossed\NotFoundActivationStrategy
;
use
Symfony\Bridge\Monolog\Handler\FingersCrossed\NotFoundActivationStrategy
;
use
Symfony\Bridge\Monolog\Processor\DebugProcessor
;
use
Symfony\Bridge\Monolog\Processor\DebugProcessor
;
use
Silex\EventListener\LogListener
;
use
Silex\EventListener\LogListener
;
...
@@ -38,12 +37,6 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
...
@@ -38,12 +37,6 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
};
};
if
(
$bridge
=
class_exists
(
'Symfony\Bridge\Monolog\Logger'
))
{
if
(
$bridge
=
class_exists
(
'Symfony\Bridge\Monolog\Logger'
))
{
$app
[
'monolog.handler.debug'
]
=
function
()
use
(
$app
)
{
$level
=
MonologServiceProvider
::
translateLevel
(
$app
[
'monolog.level'
]);
return
new
DebugHandler
(
$level
);
};
if
(
isset
(
$app
[
'request_stack'
]))
{
if
(
isset
(
$app
[
'request_stack'
]))
{
$app
[
'monolog.not_found_activation_strategy'
]
=
function
()
use
(
$app
)
{
$app
[
'monolog.not_found_activation_strategy'
]
=
function
()
use
(
$app
)
{
return
new
NotFoundActivationStrategy
(
$app
[
'request_stack'
],
[
'^/'
],
$app
[
'monolog.level'
]);
return
new
NotFoundActivationStrategy
(
$app
[
'request_stack'
],
[
'^/'
],
$app
[
'monolog.level'
]);
...
@@ -64,11 +57,7 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
...
@@ -64,11 +57,7 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
$log
->
pushHandler
(
$handler
);
$log
->
pushHandler
(
$handler
);
if
(
$app
[
'debug'
]
&&
$bridge
)
{
if
(
$app
[
'debug'
]
&&
$bridge
)
{
if
(
class_exists
(
DebugProcessor
::
class
))
{
$log
->
pushProcessor
(
new
DebugProcessor
());
$log
->
pushProcessor
(
new
DebugProcessor
());
}
else
{
$log
->
pushHandler
(
$app
[
'monolog.handler.debug'
]);
}
}
}
return
$log
;
return
$log
;
...
...
src/Silex/Provider/TwigServiceProvider.php
View file @
816f4591
...
@@ -128,7 +128,7 @@ class TwigServiceProvider implements ServiceProviderInterface
...
@@ -128,7 +128,7 @@ class TwigServiceProvider implements ServiceProviderInterface
return
new
FormRenderer
(
$app
[
'twig.form.engine'
],
$csrfTokenManager
);
return
new
FormRenderer
(
$app
[
'twig.form.engine'
],
$csrfTokenManager
);
};
};
$twig
->
addExtension
(
new
FormExtension
(
class_exists
(
HttpKernelRuntime
::
class
)
?
null
:
$app
[
'twig.form.renderer'
]
));
$twig
->
addExtension
(
new
FormExtension
());
// add loader for Symfony built-in form templates
// add loader for Symfony built-in form templates
$reflected
=
new
\ReflectionClass
(
'Symfony\Bridge\Twig\Extension\FormExtension'
);
$reflected
=
new
\ReflectionClass
(
'Symfony\Bridge\Twig\Extension\FormExtension'
);
...
...
tests/Silex/Tests/ApplicationTest.php
View file @
816f4591
...
@@ -25,7 +25,6 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
...
@@ -25,7 +25,6 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
use
Symfony\Component\HttpKernel\HttpKernelInterface
;
use
Symfony\Component\HttpKernel\HttpKernelInterface
;
use
Symfony\Component\EventDispatcher\Event
;
use
Symfony\Component\EventDispatcher\Event
;
use
Symfony\Component\Routing\RouteCollection
;
use
Symfony\Component\Routing\RouteCollection
;
use
Symfony\Component\WebLink\HttpHeaderSerializer
;
/**
/**
* Application test cases.
* Application test cases.
...
@@ -661,10 +660,6 @@ class ApplicationTest extends TestCase
...
@@ -661,10 +660,6 @@ class ApplicationTest extends TestCase
public
function
testWebLinkListener
()
public
function
testWebLinkListener
()
{
{
if
(
!
class_exists
(
HttpHeaderSerializer
::
class
))
{
self
::
markTestSkipped
(
'Symfony WebLink component is required.'
);
}
$app
=
new
Application
();
$app
=
new
Application
();
$app
->
get
(
'/'
,
function
()
{
$app
->
get
(
'/'
,
function
()
{
...
...
tests/Silex/Tests/Provider/AssetServiceProviderTest.php
View file @
816f4591
...
@@ -36,12 +36,6 @@ class AssetServiceProviderTest extends TestCase
...
@@ -36,12 +36,6 @@ class AssetServiceProviderTest extends TestCase
public
function
testJsonManifestVersionStrategy
()
public
function
testJsonManifestVersionStrategy
()
{
{
if
(
!
class_exists
(
'Symfony\Component\Asset\VersionStrategy\JsonManifestVersionStrategy'
))
{
$this
->
markTestSkipped
(
'JsonManifestVersionStrategy class is not available.'
);
return
;
}
$app
=
new
Application
();
$app
=
new
Application
();
$app
->
register
(
new
AssetServiceProvider
(),
[
$app
->
register
(
new
AssetServiceProvider
(),
[
'assets.json_manifest_path'
=>
__DIR__
.
'/../Fixtures/manifest.json'
,
'assets.json_manifest_path'
=>
__DIR__
.
'/../Fixtures/manifest.json'
,
...
...
tests/Silex/Tests/Provider/FormServiceProviderTest.php
View file @
816f4591
...
@@ -23,7 +23,6 @@ use Symfony\Component\Form\AbstractTypeExtension;
...
@@ -23,7 +23,6 @@ use Symfony\Component\Form\AbstractTypeExtension;
use
Symfony\Component\Form\FormTypeGuesserChain
;
use
Symfony\Component\Form\FormTypeGuesserChain
;
use
Symfony\Component\HttpFoundation\Request
;
use
Symfony\Component\HttpFoundation\Request
;
use
Symfony\Component\OptionsResolver\OptionsResolver
;
use
Symfony\Component\OptionsResolver\OptionsResolver
;
use
Symfony\Component\OptionsResolver\OptionsResolverInterface
;
use
Symfony\Component\Translation\Exception\NotFoundResourceException
;
use
Symfony\Component\Translation\Exception\NotFoundResourceException
;
class
FormServiceProviderTest
extends
TestCase
class
FormServiceProviderTest
extends
TestCase
...
@@ -313,52 +312,19 @@ class FormServiceProviderTest extends TestCase
...
@@ -313,52 +312,19 @@ class FormServiceProviderTest extends TestCase
}
}
}
}
if
(
!
class_exists
(
'Symfony\Component\Form\Deprecated\FormEvents'
))
{
class
DummyFormType
extends
AbstractType
class
DummyFormType
extends
AbstractType
{
{
}
}
else
{
// FormTypeInterface::getName() is needed by the form component 2.8.x
class
DummyFormType
extends
AbstractType
{
/**
* @return string The name of this type
*/
public
function
getName
()
{
return
'dummy'
;
}
}
}
}
if
(
method_exists
(
'Symfony\Component\Form\AbstractType'
,
'configureOptions'
))
{
class
DummyFormTypeExtension
extends
AbstractTypeExtension
class
DummyFormTypeExtension
extends
AbstractTypeExtension
{
public
function
getExtendedType
()
{
{
public
function
getExtendedType
()
return
'Symfony\Component\Form\Extension\Core\Type\FileType'
;
{
return
'Symfony\Component\Form\Extension\Core\Type\FileType'
;
}
public
function
configureOptions
(
OptionsResolver
$resolver
)
{
$resolver
->
setDefined
([
'image_path'
]);
}
}
}
}
else
{
class
DummyFormTypeExtension
extends
AbstractTypeExtension
{
public
function
getExtendedType
()
{
return
'Symfony\Component\Form\Extension\Core\Type\FileType'
;
}
public
function
setDefaultOptions
(
OptionsResolverInterface
$resolver
)
public
function
configureOptions
(
OptionsResolver
$resolver
)
{
{
if
(
!
method_exists
(
$resolver
,
'setDefined'
))
{
$resolver
->
setDefined
([
'image_path'
]);
$resolver
->
setOptional
([
'image_path'
]);
}
else
{
$resolver
->
setDefined
([
'image_path'
]);
}
}
}
}
}
}
tests/Silex/Tests/Provider/TwigServiceProviderTest.php
View file @
816f4591
...
@@ -18,9 +18,7 @@ use Silex\Provider\CsrfServiceProvider;
...
@@ -18,9 +18,7 @@ use Silex\Provider\CsrfServiceProvider;
use
Silex\Provider\FormServiceProvider
;
use
Silex\Provider\FormServiceProvider
;
use
Silex\Provider\TwigServiceProvider
;
use
Silex\Provider\TwigServiceProvider
;
use
Silex\Provider\AssetServiceProvider
;
use
Silex\Provider\AssetServiceProvider
;
use
Symfony\Bridge\Twig\Extension\WebLinkExtension
;
use
Symfony\Component\HttpFoundation\Request
;
use
Symfony\Component\HttpFoundation\Request
;
use
Symfony\Component\WebLink\HttpHeaderSerializer
;
/**
/**
* TwigProvider test cases.
* TwigProvider test cases.
...
@@ -147,10 +145,6 @@ class TwigServiceProviderTest extends TestCase
...
@@ -147,10 +145,6 @@ class TwigServiceProviderTest extends TestCase
public
function
testWebLinkIntegration
()
public
function
testWebLinkIntegration
()
{
{
if
(
!
class_exists
(
HttpHeaderSerializer
::
class
)
||
!
class_exists
(
WebLinkExtension
::
class
))
{
$this
->
markTestSkipped
(
'Twig WebLink extension not available.'
);
}
$app
=
new
Application
();
$app
=
new
Application
();
$app
[
'request_stack'
]
->
push
(
$request
=
Request
::
create
(
'/'
));
$app
[
'request_stack'
]
->
push
(
$request
=
Request
::
create
(
'/'
));
$app
->
register
(
new
TwigServiceProvider
(),
[
$app
->
register
(
new
TwigServiceProvider
(),
[
...
...
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