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
18e248a2
Commit
18e248a2
authored
Jul 13, 2012
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated deps
parent
895c77b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
25 deletions
+30
-25
composer.lock
composer.lock
+22
-22
src/Silex/Provider/FormServiceProvider.php
src/Silex/Provider/FormServiceProvider.php
+6
-1
src/Silex/Provider/SessionServiceProvider.php
src/Silex/Provider/SessionServiceProvider.php
+2
-2
No files found.
composer.lock
View file @
18e248a2
...
@@ -34,8 +34,8 @@
...
@@ -34,8 +34,8 @@
{
{
"package": "symfony/http-foundation",
"package": "symfony/http-foundation",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
3399f6f068cd41f1b42140699db1f1e6d3bcb36
1",
"source-reference": "
fea04f56086f14d93e6b5188adfa92e9efc354e
1",
"commit-date": "13421
07786
"
"commit-date": "13421
97254
"
},
},
{
{
"package": "symfony/http-kernel",
"package": "symfony/http-kernel",
...
@@ -58,8 +58,8 @@
...
@@ -58,8 +58,8 @@
{
{
"package": "symfony/routing",
"package": "symfony/routing",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
67c72b042d753e6ee3675eb4b0c2165243d34055
",
"source-reference": "
e40a44a94c17f18229e2382232cc980602516ff9
",
"commit-date": "134
1890620
"
"commit-date": "134
2188338
"
}
}
],
],
"packages-dev": [
"packages-dev": [
...
@@ -94,8 +94,8 @@
...
@@ -94,8 +94,8 @@
{
{
"package": "swiftmailer/swiftmailer",
"package": "swiftmailer/swiftmailer",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
420e227f2238d2c21e464c15f103540d83b0d23b
",
"source-reference": "
8b2aa953f87da228ba413e8fb1372e49c1374050
",
"commit-date": "134
1949155
"
"commit-date": "134
2198037
"
},
},
{
{
"package": "symfony/browser-kit",
"package": "symfony/browser-kit",
...
@@ -106,8 +106,8 @@
...
@@ -106,8 +106,8 @@
{
{
"package": "symfony/browser-kit",
"package": "symfony/browser-kit",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
8ea03fae14e2938b0d177a8812c5201d5510f9b
7",
"source-reference": "
7284574831a0be165974f32aacd47243d5b9e4d
7",
"commit-date": "134
1838460
"
"commit-date": "134
2207366
"
},
},
{
{
"package": "symfony/config",
"package": "symfony/config",
...
@@ -118,8 +118,8 @@
...
@@ -118,8 +118,8 @@
{
{
"package": "symfony/config",
"package": "symfony/config",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
c69e45e6744a607a8b2b9067008a47a0517c7cad
",
"source-reference": "
e94d9f83fbf64fb7c9be9367beac316b1ca98f92
",
"commit-date": "134
1929657
"
"commit-date": "134
2207366
"
},
},
{
{
"package": "symfony/css-selector",
"package": "symfony/css-selector",
...
@@ -130,8 +130,8 @@
...
@@ -130,8 +130,8 @@
{
{
"package": "symfony/css-selector",
"package": "symfony/css-selector",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
389349c90d9ac4f967ed74634186ce922d68cf93
",
"source-reference": "
e730ed6d7e76dedeeb8f797d9afc360b85e20cd0
",
"commit-date": "134
1838460
"
"commit-date": "134
2207366
"
},
},
{
{
"package": "symfony/dom-crawler",
"package": "symfony/dom-crawler",
...
@@ -166,8 +166,8 @@
...
@@ -166,8 +166,8 @@
{
{
"package": "symfony/form",
"package": "symfony/form",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
56a3edb4ddf5fcbece6f403bfe9573b2f6b4b7ba
",
"source-reference": "
f5905ab087ee8de72e98897c81d754d815e70556
",
"commit-date": "1342
089356
"
"commit-date": "1342
207591
"
},
},
{
{
"package": "symfony/locale",
"package": "symfony/locale",
...
@@ -190,8 +190,8 @@
...
@@ -190,8 +190,8 @@
{
{
"package": "symfony/monolog-bridge",
"package": "symfony/monolog-bridge",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
v2.1.0-BETA2
",
"source-reference": "
bb3915a78c2ebc32bd5e93a5b160adf36a2256e0
",
"commit-date": "13
37360698
"
"commit-date": "13
42207366
"
},
},
{
{
"package": "symfony/options-resolver",
"package": "symfony/options-resolver",
...
@@ -250,8 +250,8 @@
...
@@ -250,8 +250,8 @@
{
{
"package": "symfony/twig-bridge",
"package": "symfony/twig-bridge",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
5d3e234a5d366f510185a9de3a545b730f327632
",
"source-reference": "
b86963b52d5d305ab2a64973a10aca6642659ecb
",
"commit-date": "134
1913448
"
"commit-date": "134
2207366
"
},
},
{
{
"package": "symfony/validator",
"package": "symfony/validator",
...
@@ -262,8 +262,8 @@
...
@@ -262,8 +262,8 @@
{
{
"package": "symfony/validator",
"package": "symfony/validator",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
a9c3cff2694e159f531e04a4c8b7399f3bf13043
",
"source-reference": "
6cd8997a1df02353584883057c840296fa28644e
",
"commit-date": "13421
08491
"
"commit-date": "13421
76696
"
},
},
{
{
"package": "twig/twig",
"package": "twig/twig",
...
@@ -274,8 +274,8 @@
...
@@ -274,8 +274,8 @@
{
{
"package": "twig/twig",
"package": "twig/twig",
"version": "dev-master",
"version": "dev-master",
"source-reference": "
0d5a63993726057d28d68884112cc48508ab835e
",
"source-reference": "
3f9f587ba72f9da84266b93ee1d0fc025b6b010f
",
"commit-date": "13421
6160
6"
"commit-date": "13421
9707
6"
}
}
],
],
"aliases": [
"aliases": [
...
...
src/Silex/Provider/FormServiceProvider.php
View file @
18e248a2
...
@@ -16,6 +16,7 @@ use Silex\ServiceProviderInterface;
...
@@ -16,6 +16,7 @@ use Silex\ServiceProviderInterface;
use
Symfony\Component\Form\Extension\Csrf\CsrfProvider\DefaultCsrfProvider
;
use
Symfony\Component\Form\Extension\Csrf\CsrfProvider\DefaultCsrfProvider
;
use
Symfony\Component\Form\Extension\Csrf\CsrfProvider\SessionCsrfProvider
;
use
Symfony\Component\Form\Extension\Csrf\CsrfProvider\SessionCsrfProvider
;
use
Symfony\Component\Form\FormFactory
;
use
Symfony\Component\Form\FormFactory
;
use
Symfony\Component\Form\FormRegistry
;
use
Symfony\Component\Form\Extension\Core\CoreExtension
;
use
Symfony\Component\Form\Extension\Core\CoreExtension
;
use
Symfony\Component\Form\Extension\Validator\ValidatorExtension
as
FormValidatorExtension
;
use
Symfony\Component\Form\Extension\Validator\ValidatorExtension
as
FormValidatorExtension
;
use
Symfony\Component\Form\Extension\Csrf\CsrfExtension
;
use
Symfony\Component\Form\Extension\Csrf\CsrfExtension
;
...
@@ -64,8 +65,12 @@ class FormServiceProvider implements ServiceProviderInterface
...
@@ -64,8 +65,12 @@ class FormServiceProvider implements ServiceProviderInterface
return
$extensions
;
return
$extensions
;
});
});
$app
[
'form.registry'
]
=
$app
->
share
(
function
(
$app
)
{
return
new
FormRegistry
(
$app
[
'form.extensions'
]);
});
$app
[
'form.factory'
]
=
$app
->
share
(
function
(
$app
)
{
$app
[
'form.factory'
]
=
$app
->
share
(
function
(
$app
)
{
return
new
FormFactory
(
$app
[
'form.
extensions
'
]);
return
new
FormFactory
(
$app
[
'form.
registry
'
]);
});
});
$app
[
'form.csrf_provider'
]
=
$app
->
share
(
function
(
$app
)
{
$app
[
'form.csrf_provider'
]
=
$app
->
share
(
function
(
$app
)
{
...
...
src/Silex/Provider/SessionServiceProvider.php
View file @
18e248a2
...
@@ -14,7 +14,7 @@ namespace Silex\Provider;
...
@@ -14,7 +14,7 @@ namespace Silex\Provider;
use
Silex\Application
;
use
Silex\Application
;
use
Silex\ServiceProviderInterface
;
use
Silex\ServiceProviderInterface
;
use
Symfony\Component\HttpFoundation\Session\Storage\Handler\FileSessionHandler
;
use
Symfony\Component\HttpFoundation\Session\Storage\Handler\
Native
FileSessionHandler
;
use
Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage
;
use
Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage
;
use
Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage
;
use
Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage
;
use
Symfony\Component\HttpFoundation\Session\Session
;
use
Symfony\Component\HttpFoundation\Session\Session
;
...
@@ -52,7 +52,7 @@ class SessionServiceProvider implements ServiceProviderInterface
...
@@ -52,7 +52,7 @@ class SessionServiceProvider implements ServiceProviderInterface
});
});
$app
[
'session.storage.handler'
]
=
$app
->
share
(
function
(
$app
)
{
$app
[
'session.storage.handler'
]
=
$app
->
share
(
function
(
$app
)
{
return
new
FileSessionHandler
(
$app
[
'session.storage.save_path'
]);
return
new
Native
FileSessionHandler
(
$app
[
'session.storage.save_path'
]);
});
});
$app
[
'session.storage.native'
]
=
$app
->
share
(
function
(
$app
)
{
$app
[
'session.storage.native'
]
=
$app
->
share
(
function
(
$app
)
{
...
...
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