Many CS changes

DependencyInjection/Configuration.php

@@ -67,7 +67,7 @@ public function getConfigTreeBuilder()
                     ->end()
                 ->end()
                 ->validate()
-                    ->ifTrue(function($v) {
+                    ->ifTrue(function ($v) {
                                 return $v['driver']['useSsl'] && $v['driver']['useStartTls'];
                             })
                     ->thenInvalid('The useSsl and useStartTls options are mutually exclusive.')

Driver/LdapDriverException.php

@@ -9,4 +9,4 @@ public function __construct($message)
     {
         parent::__construct($message);
     }
-}
+}

Driver/LdapDriverInterface.php

@@ -23,7 +23,7 @@ interface LdapDriverInterface
      *
      * @throws LdapDriverException if some error occurs.
      */
-    function bind(UserInterface $user, $password);
+    public function bind(UserInterface $user, $password);
 
     /**
      * Search LDAP tree
@@ -41,5 +41,5 @@ function bind(UserInterface $user, $password);
      *
      * @throws LdapDriverException if some error occurs.
      */
-    function search($baseDn, $filter, array $attributes = array());
+    public function search($baseDn, $filter, array $attributes = array());
 }

Driver/LegacyLdapDriver.php

@@ -45,6 +45,7 @@ public function search($baseDn, $filter, array $attributes = array())
                 return $entries;
             }
         }
+
         return false;
     }
 
@@ -73,12 +74,12 @@ public function bind(UserInterface $user, $password)
             $bind_rdn = $user->getUsername();
         }
 
-
         if (null === $this->ldap_res) {
             $this->connect();
         }
 
         $this->logDebug(sprintf('ldap_bind(%s, ****)', $bind_rdn));
+
         return @ldap_bind($this->ldap_res, $bind_rdn, $password);
     }
 

Driver/ZendLdapDriver.php

@@ -83,7 +83,7 @@ public function bind(UserInterface $user, $password)
 
     /**
      * Treat a Zend Ldap Exception
-     * 
+     *
      * @param ZendLdapException $exception
      */
     protected function zendExceptionHandler(ZendLdapException $exception)
@@ -105,7 +105,7 @@ protected function zendExceptionHandler(ZendLdapException $exception)
 
     /**
      * Log debug messages if the logger is set.
-     * 
+     *
      * @param string $message
      */
     private function logDebug($message)

Ldap/LdapManagerInterface.php

@@ -30,7 +30,7 @@ public function findUserBy(array $criteria);
      * @param  string        $password
      * @return Boolean
      */
-    function bind(UserInterface $user, $password);
+    public function bind(UserInterface $user, $password);
 
     /**
      * Escapes the given VALUES according to RFC 2254 so that they can be safely used in LDAP filters.

Model/UserManagerInterface.php

@@ -2,8 +2,6 @@
 
 namespace FR3D\LdapBundle\Model;
 
-use FR3D\LdapBundle\Model\LdapUserInterface;
-
 interface UserManagerInterface
 {
 

README.md

@@ -53,4 +53,4 @@ Issues and feature requests are tracked in the [GitHub issue tracker](https://gi
 When reporting a bug, it may be a good idea to reproduce it in a basic project
 built using the [Symfony Standard Edition](https://github.com/symfony/symfony-standard)
 to allow developers of the bundle to reproduce the issue by simply cloning it
-and following some steps.
+and following some steps.

Resources/meta/LICENSE

@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

Security/Authentication/LdapAuthenticationProvider.php

@@ -60,9 +60,9 @@ protected function retrieveUser($username, UsernamePasswordToken $token)
             throw $notFound;
         } catch (\Exception $repositoryProblem) {
             if (Kernel::MINOR_VERSION <= 1) {
-                throw new AuthenticationServiceException($repositoryProblem->getMessage(), $token, (int)$repositoryProblem->getCode(), $repositoryProblem);
+                throw new AuthenticationServiceException($repositoryProblem->getMessage(), $token, (int) $repositoryProblem->getCode(), $repositoryProblem);
             } else {
-                $e = new AuthenticationServiceException($repositoryProblem->getMessage(), (int)$repositoryProblem->getCode(), $repositoryProblem);
+                $e = new AuthenticationServiceException($repositoryProblem->getMessage(), (int) $repositoryProblem->getCode(), $repositoryProblem);
                 $e->setToken($token);
                 throw $e;
             }

Tests/DependencyInjection/FR3DLdapExtensionTest.php

@@ -162,7 +162,7 @@ private function assertParameter($value, $key)
 
     private function assertHasDefinition($id)
     {
-        $this->assertTrue(($this->container->hasDefinition($id) ? : $this->container->hasAlias($id)), sprintf('%s definition is not set', $id));
+        $this->assertTrue(($this->container->hasDefinition($id) ?: $this->container->hasAlias($id)), sprintf('%s definition is not set', $id));
     }
 
     protected function tearDown()

Tests/Driver/AbstractLdapDriverTest.php

@@ -5,7 +5,7 @@
 require_once 'LDAPVirtual/zend-ldap_php-ldap_override.php';
 require_once 'LDAPVirtual/fr3d-ldapbundle-driver_php-ldap_override.php';
 
-abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractLdapDriverTest extends \PHPUnit_Framework_TestCase
 {
 
     protected function setUp()

Tests/Driver/LDAPVirtual/LDAPVirtualInterface.php

@@ -5,23 +5,23 @@
 interface LDAPVirtualInterface
 {
 
-    function setTls($tls);
+    public function setTls($tls);
 
-    function setSsl($ssl);
+    public function setSsl($ssl);
 
-    function setOptions($options);
+    public function setOptions($options);
 
-    function addUser($username, $password);
+    public function addUser($username, $password);
 
-    function ldap_bind($username, $password);
+    public function ldap_bind($username, $password);
 
-    function ldap_connect($host, $port);
+    public function ldap_connect($host, $port);
 
-    function ldap_set_option($option, $value);
+    public function ldap_set_option($option, $value);
 
-    function ldap_start_tls();
+    public function ldap_start_tls();
 
-    function ldap_search($baseDn, $filter, $attributes);
+    public function ldap_search($baseDn, $filter, $attributes);
 
-    function ldap_get_entries();
+    public function ldap_get_entries();
 }

Tests/Driver/LDAPVirtual/fr3d-ldapbundle-driver_php-ldap_override.php

@@ -94,4 +94,4 @@ function ldap_get_entries($ress, $result)
     }
 
     return $ldapServer->ldap_get_entries($result);
-}
+}

Tests/Driver/LDAPVirtual/zend-ldap_php-ldap_override.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file override default PHP Ldap functions for the specified namespace 
+ * This file override default PHP Ldap functions for the specified namespace
  */
 
 namespace Zend\Ldap;
@@ -95,4 +95,4 @@ function ldap_get_entries($ress, $result)
     }
 
     return $ldapServer->ldap_get_entries($result);
-}
+}

Tests/Driver/LegacyLdapDriverTest.php

@@ -100,7 +100,6 @@ public function testBindUserInterfaceByUsername()
                 ->with($this->equalTo($username), $this->equalTo($password))
                 ->will($this->returnValue(true));
 
-
         $this->assertTrue($this->legacyLdapDriver->bind($user, $password));
     }
 
@@ -147,7 +146,6 @@ public function testBindByDnFromUsername()
                 ->with($this->equalTo($entry['dn']), $this->equalTo($password))
                 ->will($this->returnValue(true));
 
-
         $this->assertTrue($this->legacyLdapDriver->bind($user, $password));
     }
 
@@ -180,4 +178,4 @@ public function testBindByDnFromBadUsername()
 
         $this->assertFalse($this->legacyLdapDriver->bind($user, $password));
     }
-}
+}

Tests/Driver/ZendLdapDriverMockedTest.php

@@ -52,7 +52,6 @@ public function testSearch()
             $entry,
         );
 
-
         $this->zend->expects($this->once())
                 ->method('searchEntries')
                 ->with($this->equalTo($filter), $this->equalTo($baseDn), $this->equalTo(Ldap::SEARCH_SCOPE_SUB), $this->equalTo($attributes))

Tests/Security/User/LdapUserProviderTest.php

@@ -68,4 +68,3 @@ public function testRefreshUser()
         $this->assertEquals($user, $this->userProvider->refreshUser($user));
     }
 }
-?>

UPGRADE-2.0.md

@@ -71,4 +71,4 @@ UPGRADE FROM 1.5 to 2.0
                 <argument type="service" id="fr3d_ldap.ldap_driver" />
                 <argument type="service" id="fr3d_ldap.user_manager" />
                 <argument>%fr3d_ldap.ldap_manager.parameters%</argument>
-            </service>
+            </service>