Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Updating composer.json to require at least SF 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
diegoholiveira committed Jun 8, 2013
1 parent ccb5093 commit 5c35a34
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
12 changes: 10 additions & 2 deletions Facebook/FacebookSessionPersistence.php
Expand Up @@ -19,8 +19,9 @@ class FacebookSessionPersistence extends \BaseFacebook
protected static $kSupportedKeys = array('state', 'code', 'access_token', 'user_id');

/**
* @param array $config the application configuration.
* @see BaseFacebook::__construct in facebook.php
* @param array $config
* @param Session $session
* @param string $prefix
*/
public function __construct($config, Session $session, $prefix = self::PREFIX)
{
Expand All @@ -36,6 +37,10 @@ public function __construct($config, Session $session, $prefix = self::PREFIX)
$this->trustForwarded = isset($config['trustForwarded']) ? $config['trustForwarded'] : Request::getTrustedProxies();
}

/**
* @param array $params
* @return string
*/
public function getLoginUrl($params = array())
{
$this->establishCSRFTokenState();
Expand All @@ -61,6 +66,9 @@ public function getLoginUrl($params = array())
);
}

/**
* @return bool|mixed
*/
protected function getCode()
{
if (isset($_REQUEST['code'])) {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -13,7 +13,7 @@ database based solution provided by FOSUserBundle.
Prerequisites
-------------

This version requires at least Symfony 2.1
This version (1.2) requires at least Symfony 2.2. If you are using Symfony 2.1, you can use the 1.1 version.


Documentation
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Expand Up @@ -18,14 +18,14 @@
],
"require": {
"php": ">=5.3.2",
"symfony/http-foundation": ">=2.1,<2.4",
"symfony/security": ">=2.1,<2.4",
"symfony/http-foundation": ">=2.2,<2.4",
"symfony/security": ">=2.2,<2.4",
"facebook/php-sdk": "3.2.*"
},
"require-dev": {
"symfony/framework-bundle": ">=2.1,<2.4",
"symfony/security-bundle": ">=2.1,<2.4",
"symfony/twig-bundle": ">=2.1,<2.4",
"symfony/framework-bundle": ">=2.2,<2.4",
"symfony/security-bundle": ">=2.2,<2.4",
"symfony/twig-bundle": ">=2.2,<2.4",
"phpunit/phpunit": "3.7.*"
},
"config": {
Expand Down

0 comments on commit 5c35a34

Please sign in to comment.