Hotfix. Remove unused loginUrl property. Fix namespace typo in Adapte…

…r\Exception classes. Housekeeping on formatting for all Exception classes.
jeremiahsmall · Mar 10, 2013 · 89ce570 · 89ce570
1 parent 549744d
commit 89ce570
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 28 deletions.
diff --git a/library/Soliant/SimpleFM/ZF2/Authentication/Adapter/Exception/InvalidArgumentException.php b/library/Soliant/SimpleFM/ZF2/Authentication/Adapter/Exception/InvalidArgumentException.php
@@ -2,8 +2,6 @@
 
 namespace Soliant\SimpleFM\ZF2\Authentication\Adapter\Exception;
 
-class InvalidArgumentException
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-    extends \InvalidArgumentException
-    implements \SimpleFM\Authentication\Adapter\Exception\ExceptionInterface
 {
 } 
diff --git a/library/Soliant/SimpleFM/ZF2/Authentication/Adapter/Exception/RuntimeException.php b/library/Soliant/SimpleFM/ZF2/Authentication/Adapter/Exception/RuntimeException.php
@@ -2,9 +2,7 @@
 
 namespace Soliant\SimpleFM\ZF2\Authentication\Adapter\Exception;
 
-class RuntimeException 
+class RuntimeException extends \RuntimeException implements ExceptionInterface
-    extends \RuntimeException 
-    implements \SimpleFM\Authentication\Adapter\Exception\ExceptionInterface
 {
 
 }
diff --git a/library/Soliant/SimpleFM/ZF2/Authentication/Adapter/Exception/UnexpectedValueException.php b/library/Soliant/SimpleFM/ZF2/Authentication/Adapter/Exception/UnexpectedValueException.php
@@ -2,8 +2,6 @@
 
 namespace Soliant\SimpleFM\ZF2\Authentication\Adapter\Exception;
 
-class UnexpectedValueException
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
-    extends \UnexpectedValueException
-    implements \SimpleFM\Authentication\Adapter\Exception\ExceptionInterface
 {
 }
diff --git a/library/Soliant/SimpleFM/ZF2/Authentication/Adapter/SimpleFM.php b/library/Soliant/SimpleFM/ZF2/Authentication/Adapter/SimpleFM.php
@@ -32,13 +32,6 @@ class SimpleFM implements \Zend\Authentication\Adapter\AdapterInterface
      */
     protected $password;
 
-    /**
-     * URI of user login form
-     *
-     * @var string
-     */
-    protected $loginUrl;
-
     /**
      * Adapter to be used for login validation
      *
@@ -85,23 +78,19 @@ class SimpleFM implements \Zend\Authentication\Adapter\AdapterInterface
      * Constructor
      *
      * @param  array $config Configuration settings:
-     *    'loginUrl'                => string Example: '/login'
      *    'validateSimpleFmAdapter' => Soliant\SimpleFM\Adapter
      *    'encryptionKey'           => string Example: '56cb36c21eb9a29c1317092b973a5f9cba393a367de783af45a2799f7302c',
      *    'appUsername'             => string Example: 'webSystem'
      *    'appPassword'             => string Example: '317akx1gr43m4pd'
+     *    'identityLayout'          => string Example: 'gateway_User'
+     *    'accountNameField'        => string Example: 'AccountName'
      * @throws Soliant\SimpleFM\ZF2\Authentication\Adapter\InvalidArgumentException
      * @return void
      */
     public function __construct(array $config, Adapter $simpleFmValidateAdapter)
     {
         $this->simpleFmValidateAdapter = $simpleFmValidateAdapter;
 
-        if (empty($config['loginUrl'])) {
-            throw new Exception\InvalidArgumentException('Config key \'loginUrl\' is required');
-        }
-        $this->loginUrl = $config['loginUrl'];
-
         if (empty($config['encryptionKey'])) {
             throw new Exception\InvalidArgumentException('Config key \'encryptionKey\' is required');
         }

diff --git a/library/Soliant/SimpleFM/ZF2/Authentication/Mapper/Exception/InvalidArgumentException.php b/library/Soliant/SimpleFM/ZF2/Authentication/Mapper/Exception/InvalidArgumentException.php
@@ -2,8 +2,6 @@
 
 namespace Soliant\SimpleFM\ZF2\Authentication\Mapper\Exception;
 
-class InvalidArgumentException
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-    extends \InvalidArgumentException
-    implements ExceptionInterface
 {
 } 
diff --git a/library/Soliant/SimpleFM/ZF2/Authentication/Storage/Exception/InvalidArgumentException.php b/library/Soliant/SimpleFM/ZF2/Authentication/Storage/Exception/InvalidArgumentException.php
@@ -2,8 +2,6 @@
 
 namespace Soliant\SimpleFM\ZF2\Authentication\Storage\Exception;
 
-class InvalidArgumentException
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-    extends \InvalidArgumentException
-    implements ExceptionInterface
 {
 }