@@ -24,6 +24,9 @@ |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | |
27 | + /** |
|
28 | + * @param \SAML2\Assertion\Validation\Result $result |
|
29 | + */ |
|
27 | 30 | public function validate(SamlSignedElement $signedElement, $result) |
28 | 31 | { |
29 | 32 | /** @var \Exception $error */ |
@@ -3,9 +3,9 @@ |
||
3 | 3 | |
4 | 4 | namespace flipbox\saml\core\validators; |
5 | 5 | |
6 | -use flipbox\saml\core\AbstractPlugin; |
|
7 | 6 | use RobRichards\XMLSecLibs\XMLSecurityKey; |
8 | 7 | use SAML2\SignedElement as SamlSignedElement; |
8 | +use flipbox\saml\core\AbstractPlugin; |
|
9 | 9 | |
10 | 10 | class SignedElement |
11 | 11 | { |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | { |
8 | 8 | |
9 | 9 | /** |
10 | - * @return array|mixed |
|
10 | + * @return string |
|
11 | 11 | */ |
12 | 12 | public function __toString() |
13 | 13 | { |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | /** |
18 | 18 | * @param string $json |
19 | - * @return mixed |
|
19 | + * @return JsonModel |
|
20 | 20 | */ |
21 | 21 | public static function jsonUnserialize(string $json) |
22 | 22 | { |
@@ -63,7 +63,7 @@ |
||
63 | 63 | |
64 | 64 | /** |
65 | 65 | * @param string|null $expiry |
66 | - * @return \DateTime |
|
66 | + * @return MetadataOptions |
|
67 | 67 | */ |
68 | 68 | public function setExpiryDate($expiry) |
69 | 69 | { |
@@ -6,15 +6,15 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\core\services\messages; |
8 | 8 | |
9 | -use craft\base\Component; |
|
10 | -use flipbox\saml\core\models\SettingsInterface; |
|
11 | -use flipbox\saml\core\records\AbstractProvider; |
|
12 | -use flipbox\saml\core\records\AbstractProviderIdentity; |
|
13 | 9 | use SAML2\Constants; |
14 | 10 | use SAML2\HTTPRedirect; |
15 | 11 | use SAML2\LogoutRequest as SamlLogoutRequest; |
16 | 12 | use SAML2\XML\saml\Issuer; |
17 | 13 | use SAML2\XML\saml\NameID; |
14 | +use craft\base\Component; |
|
15 | +use flipbox\saml\core\models\SettingsInterface; |
|
16 | +use flipbox\saml\core\records\AbstractProvider; |
|
17 | +use flipbox\saml\core\records\AbstractProviderIdentity; |
|
18 | 18 | use yii\base\Event; |
19 | 19 | |
20 | 20 | /** |
@@ -6,13 +6,12 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\core\services\messages; |
8 | 8 | |
9 | -use craft\base\Component; |
|
10 | -use flipbox\saml\core\models\SettingsInterface; |
|
11 | -use flipbox\saml\core\records\AbstractProvider; |
|
12 | -use SAML2\Constants; |
|
13 | 9 | use SAML2\LogoutRequest; |
14 | 10 | use SAML2\LogoutResponse as SamlLogoutResponse; |
15 | 11 | use SAML2\XML\saml\Issuer; |
12 | +use craft\base\Component; |
|
13 | +use flipbox\saml\core\models\SettingsInterface; |
|
14 | +use flipbox\saml\core\records\AbstractProvider; |
|
16 | 15 | use yii\base\Event; |
17 | 16 | |
18 | 17 | /** |
@@ -44,7 +44,7 @@ |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
47 | - * @param $key |
|
47 | + * @param string $key |
|
48 | 48 | * @return string |
49 | 49 | */ |
50 | 50 | protected function getName($key) |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use craft\db\ActiveQuery; |
6 | 6 | use craft\db\Migration; |
7 | -use craft\helpers\ArrayHelper; |
|
8 | 7 | use flipbox\saml\core\records\AbstractProvider; |
9 | 8 | use flipbox\saml\core\records\LinkRecord; |
10 | 9 |
@@ -7,26 +7,26 @@ |
||
7 | 7 | |
8 | 8 | namespace flipbox\saml\core; |
9 | 9 | |
10 | +use SAML2\Compat\AbstractContainer; |
|
10 | 11 | use craft\base\Plugin; |
11 | 12 | use craft\events\RegisterTemplateRootsEvent; |
12 | 13 | use craft\events\RegisterUrlRulesEvent; |
13 | 14 | use craft\helpers\StringHelper; |
14 | -use flipbox\saml\core\helpers\UrlHelper; |
|
15 | -use craft\web\twig\variables\CraftVariable; |
|
16 | 15 | use craft\web\View; |
16 | +use craft\web\twig\variables\CraftVariable; |
|
17 | 17 | use flipbox\craft\psr3\Logger; |
18 | +use flipbox\saml\core\helpers\UrlHelper; |
|
18 | 19 | use flipbox\saml\core\models\AbstractSettings; |
19 | 20 | use flipbox\saml\core\models\SettingsInterface; |
20 | 21 | use flipbox\saml\core\services\AbstractCp; |
21 | -use flipbox\saml\core\services\bindings\Factory; |
|
22 | 22 | use flipbox\saml\core\services\Cp; |
23 | 23 | use flipbox\saml\core\services\EditProvider; |
24 | -use flipbox\saml\core\services\messages\LogoutRequest; |
|
25 | -use flipbox\saml\core\services\messages\LogoutResponse; |
|
26 | 24 | use flipbox\saml\core\services\Metadata; |
27 | 25 | use flipbox\saml\core\services\ProviderIdentityServiceInterface; |
28 | 26 | use flipbox\saml\core\services\ProviderServiceInterface; |
29 | -use SAML2\Compat\AbstractContainer; |
|
27 | +use flipbox\saml\core\services\bindings\Factory; |
|
28 | +use flipbox\saml\core\services\messages\LogoutRequest; |
|
29 | +use flipbox\saml\core\services\messages\LogoutResponse; |
|
30 | 30 | use yii\base\Event; |
31 | 31 | |
32 | 32 | /** |
@@ -9,7 +9,6 @@ |
||
9 | 9 | namespace flipbox\saml\core\models; |
10 | 10 | |
11 | 11 | use craft\base\Model; |
12 | -use craft\config\GeneralConfig; |
|
13 | 12 | use craft\helpers\UrlHelper; |
14 | 13 | |
15 | 14 | abstract class AbstractSettings extends Model implements SettingsInterface |