From 93920169c12d8efe9e892be005bc5dc94e78a1ca Mon Sep 17 00:00:00 2001 From: William Date: Wed, 7 Apr 2021 08:53:39 +0200 Subject: [PATCH 1/2] Fix php-cs-fixer URL. --- .travis.yml | 2 +- contrib/setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 41915914..2fdb0214 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ php: before_install: - composer self-update - composer --version - - if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then wget http://get.sensiolabs.org/php-cs-fixer.phar -O php-cs-fixer.phar; fi + - if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then wget https://cs.symfony.com/download/php-cs-fixer-v2.phar -O php-cs-fixer.phar; fi - if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then php php-cs-fixer.phar --version; fi - if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.1.0/php-coveralls.phar; fi diff --git a/contrib/setup.sh b/contrib/setup.sh index 9fa9c639..3c4eecef 100644 --- a/contrib/setup.sh +++ b/contrib/setup.sh @@ -2,7 +2,7 @@ if [ ! -f php-cs-fixer.phar ]; then echo "The php-cs-fixer.phar is required... downloading..." - wget http://get.sensiolabs.org/php-cs-fixer.phar -O php-cs-fixer.phar || curl http://get.sensiolabs.org/php-cs-fixer.phar -o php-cs-fixer.phar || { echo >&2 "I require wget or curl but they are not installed. Aborting."; exit 1; } + wget https://cs.symfony.com/download/php-cs-fixer-v2.phar -O php-cs-fixer.phar || curl https://cs.symfony.com/download/php-cs-fixer-v2.phar -o php-cs-fixer.phar || { echo >&2 "I require wget or curl but they are not installed. Aborting."; exit 1; } fi # Copy the pre-commit hook to the current repository hooks directory. From 1ba953628be0cb1bba18aaa609e9992a11a53fd5 Mon Sep 17 00:00:00 2001 From: William Date: Wed, 7 Apr 2021 08:58:19 +0200 Subject: [PATCH 2/2] Clean code. --- src/LightSaml/Action/ActionInterface.php | 3 - src/LightSaml/Action/ActionLogWrapper.php | 5 - .../Action/ActionWrapperInterface.php | 2 - .../Assertion/AbstractAssertionAction.php | 9 -- .../AssertionIssuerFormatValidatorAction.php | 6 +- .../AssertionSignatureValidatorAction.php | 10 +- .../Inbound/AssertionValidatorAction.php | 7 -- .../Inbound/InResponseToValidatorAction.php | 10 +- .../Inbound/KnownAssertionIssuerAction.php | 6 -- .../Inbound/RecipientValidatorAction.php | 13 --- .../Inbound/RepeatedIdValidatorAction.php | 10 -- .../Assertion/Inbound/TimeValidatorAction.php | 7 +- src/LightSaml/Action/CatchableErrorAction.php | 6 -- src/LightSaml/Action/CompositeAction.php | 16 ++-- .../Action/CompositeActionInterface.php | 2 - src/LightSaml/Action/DispatchEventAction.php | 5 +- src/LightSaml/Action/LoggableAction.php | 14 +-- src/LightSaml/Action/NullAction.php | 2 - .../Action/Profile/AbstractProfileAction.php | 7 +- .../Entity/SerializeOwnEntityAction.php | 7 +- .../Profile/FlushRequestStatesAction.php | 8 +- .../AbstractDestinationValidatorAction.php | 9 +- .../Message/AssertBindingTypeAction.php | 10 +- ...DestinationValidatorAuthnRequestAction.php | 3 +- .../DestinationValidatorResponseAction.php | 3 +- .../Inbound/Message/IssuerValidatorAction.php | 6 +- .../MessageSignatureValidatorAction.php | 12 +-- .../Inbound/Message/ReceiveMessageAction.php | 10 +- .../Message/ResolvePartyEntityIdAction.php | 21 +--- .../Inbound/Response/AssertionAction.php | 15 +-- .../Response/DecryptAssertionsAction.php | 27 ++---- .../Inbound/Response/SpSsoStateAction.php | 3 - .../InResponseToValidatorAction.php | 17 +--- .../Message/CreateMessageIssuerAction.php | 2 - .../Outbound/Message/DestinationAction.php | 2 - .../Outbound/Message/MessageIdAction.php | 2 +- .../Message/MessageIssueInstantAction.php | 6 -- .../Outbound/Message/MessageVersionAction.php | 5 +- .../Message/ResolveEndpointBaseAction.php | 29 ++---- .../Message/SaveRequestStateAction.php | 7 -- .../Outbound/Message/SendMessageAction.php | 10 +- .../Outbound/Message/SignMessageAction.php | 12 +-- src/LightSaml/Action/WrappedAction.php | 11 --- src/LightSaml/Binding/AbstractBinding.php | 11 +-- src/LightSaml/Binding/BindingFactory.php | 14 +-- .../Binding/BindingFactoryInterface.php | 4 - src/LightSaml/Binding/HttpPostBinding.php | 9 +- src/LightSaml/Binding/HttpRedirectBinding.php | 38 ++------ src/LightSaml/Binding/SamlPostResponse.php | 3 +- .../Container/AbstractPimpleContainer.php | 3 - .../Factory/CredentialContainerProvider.php | 8 +- .../Factory/OwnContainerProvider.php | 7 +- .../Factory/ServiceContainerProvider.php | 9 +- .../Bridge/Pimple/Container/OwnContainer.php | 2 +- .../Pimple/Container/ServiceContainer.php | 2 +- .../Build/Container/OwnContainerInterface.php | 2 +- .../Container/ServiceContainerInterface.php | 2 +- .../Builder/Action/CompositeActionBuilder.php | 7 +- .../Profile/AbstractProfileActionBuilder.php | 3 - .../Sp/SsoSpReceiveResponseActionBuilder.php | 12 +-- .../Sp/SsoSpSendAuthnRequestActionBuilder.php | 2 +- .../SsoSpValidateAssertionActionBuilder.php | 2 +- .../Builder/Context/ProfileContextBuilder.php | 4 - .../SimpleEntityDescriptorBuilder.php | 24 ++--- .../Profile/AbstractProfileBuilder.php | 3 - .../SsoSpSendAuthnRequestProfileBuilder.php | 5 +- ...pSendAuthnRequestProfileBuilderFactory.php | 3 - src/LightSaml/Context/AbstractContext.php | 16 ++-- src/LightSaml/Context/ContextInterface.php | 4 +- .../Context/Profile/EndpointContext.php | 2 - .../Context/Profile/EntityContext.php | 4 - .../Context/Profile/ExceptionContext.php | 5 - .../Profile/Helper/AssertionContextHelper.php | 2 - .../Context/Profile/Helper/LogHelper.php | 17 ++-- .../Profile/Helper/MessageContextHelper.php | 14 --- .../Context/Profile/HttpRequestContext.php | 2 - .../Context/Profile/HttpResponseContext.php | 2 - .../Context/Profile/LogoutContext.php | 2 - .../Context/Profile/MessageContext.php | 2 - .../Credential/AbstractCredential.php | 10 +- .../Context/CredentialContextSet.php | 4 +- .../Context/MetadataCredentialContext.php | 5 - src/LightSaml/Credential/KeyHelper.php | 11 +-- src/LightSaml/Credential/X509Certificate.php | 2 +- src/LightSaml/Credential/X509Credential.php | 5 +- src/LightSaml/Criteria/CriteriaSet.php | 12 +-- .../LightSamlAuthenticationException.php | 7 +- .../Error/LightSamlContextException.php | 7 +- src/LightSaml/Meta/ParameterBag.php | 8 +- src/LightSaml/Model/AbstractSamlModel.php | 96 +++++-------------- .../Model/Assertion/AbstractNameID.php | 29 +++--- src/LightSaml/Model/Assertion/Assertion.php | 45 ++++----- src/LightSaml/Model/Assertion/Attribute.php | 21 ++-- .../Model/Assertion/AttributeStatement.php | 13 +-- .../Model/Assertion/AudienceRestriction.php | 16 +--- .../Model/Assertion/AuthnContext.php | 35 +++---- .../Model/Assertion/AuthnStatement.php | 27 ++---- src/LightSaml/Model/Assertion/Conditions.php | 23 ++--- .../Assertion/EncryptedAssertionReader.php | 9 +- .../Assertion/EncryptedAssertionWriter.php | 3 - .../Assertion/EncryptedElementReader.php | 31 +----- .../Assertion/EncryptedElementWriter.php | 19 +--- src/LightSaml/Model/Assertion/OneTimeUse.php | 7 -- .../Model/Assertion/ProxyRestriction.php | 15 +-- src/LightSaml/Model/Assertion/Subject.php | 23 ++--- .../Model/Assertion/SubjectConfirmation.php | 31 ++---- .../Assertion/SubjectConfirmationData.php | 27 ++---- .../Model/Assertion/SubjectLocality.php | 13 +-- .../Model/Context/DeserializationContext.php | 2 - .../Model/Context/SerializationContext.php | 3 - .../Metadata/AssertionConsumerService.php | 4 - .../Model/Metadata/ContactPerson.php | 49 ++++------ src/LightSaml/Model/Metadata/Endpoint.php | 18 +--- .../Model/Metadata/EndpointReference.php | 5 - .../Model/Metadata/EntitiesDescriptor.php | 25 ++--- .../Model/Metadata/EntityDescriptor.php | 42 ++++---- .../Model/Metadata/IdpSsoDescriptor.php | 30 ++---- .../Model/Metadata/IndexedEndpoint.php | 12 +-- .../Model/Metadata/KeyDescriptor.php | 20 +--- src/LightSaml/Model/Metadata/Metadata.php | 13 +-- src/LightSaml/Model/Metadata/Organization.php | 21 ++-- .../Model/Metadata/RoleDescriptor.php | 43 +++------ .../Model/Metadata/SSODescriptor.php | 16 +--- .../Model/Metadata/SingleLogoutService.php | 4 - .../Model/Metadata/SpSsoDescriptor.php | 20 +--- src/LightSaml/Model/Protocol/AuthnRequest.php | 53 +++++----- .../Model/Protocol/LogoutRequest.php | 36 +++---- .../Model/Protocol/LogoutResponse.php | 10 +- src/LightSaml/Model/Protocol/NameIDPolicy.php | 13 +-- src/LightSaml/Model/Protocol/Response.php | 32 ++----- src/LightSaml/Model/Protocol/SamlMessage.php | 54 ++++------- src/LightSaml/Model/Protocol/Status.php | 24 ++--- src/LightSaml/Model/Protocol/StatusCode.php | 21 ++-- .../Model/Protocol/StatusResponse.php | 21 ++-- src/LightSaml/Model/SamlElementInterface.php | 6 -- .../Model/XmlDSig/AbstractSignatureReader.php | 4 - .../Model/XmlDSig/SignatureStringReader.php | 9 -- .../Model/XmlDSig/SignatureWriter.php | 33 ++----- .../Model/XmlDSig/SignatureXmlReader.php | 23 ++--- .../AttributeValueProviderInterface.php | 2 - .../Attribute/FixedAttributeValueProvider.php | 6 +- .../Credential/X509CredentialFileProvider.php | 2 +- .../EntitiesDescriptorEntityProvider.php | 3 +- .../FixedEntityDescriptorProvider.php | 3 - .../Provider/NameID/FixedNameIdProvider.php | 7 -- .../NameID/NameIdProviderInterface.php | 2 - .../Credential/AbstractCompositeResolver.php | 4 +- .../Credential/AlgorithmFilterResolver.php | 5 +- .../Credential/CompositeFilterResolver.php | 3 +- .../Credential/CompositeUnionResolver.php | 5 +- .../CredentialNameFilterResolver.php | 5 +- .../CredentialResolverInterface.php | 3 +- .../Credential/CredentialResolverQuery.php | 9 +- .../Resolver/Credential/EntityIdResolver.php | 12 +-- .../Factory/CredentialResolverFactory.php | 3 - .../Credential/MetadataFilterResolver.php | 11 +-- .../Credential/PrivateKeyResolver.php | 7 +- .../PublicKeyThumbprintResolver.php | 5 +- .../Credential/UsageFilterResolver.php | 7 +- .../Credential/X509CredentialResolver.php | 9 +- .../Endpoint/BindingEndpointResolver.php | 7 +- .../Endpoint/CompositeEndpointResolver.php | 7 +- .../Endpoint/Criteria/BindingCriteria.php | 2 +- .../DescriptorTypeEndpointResolver.php | 3 +- .../Endpoint/EndpointResolverInterface.php | 1 - .../Endpoint/IndexEndpointResolver.php | 5 +- .../Endpoint/LocationEndpointResolver.php | 5 +- .../Endpoint/ServiceTypeEndpointResolver.php | 3 +- .../Resolver/Session/SessionProcessor.php | 27 ++---- .../Signature/OwnSignatureResolver.php | 19 ++-- .../Signature/SignatureResolverInterface.php | 2 - src/LightSaml/SamlConstants.php | 32 +++---- src/LightSaml/State/Request/RequestState.php | 2 +- src/LightSaml/State/Sso/SsoSessionState.php | 11 +-- src/LightSaml/State/Sso/SsoState.php | 12 +-- .../Credential/CompositeCredentialStore.php | 6 +- .../Credential/Factory/CredentialFactory.php | 15 +-- .../Credential/MetadataCredentialStore.php | 24 ++--- .../Credential/StaticCredentialStore.php | 6 +- .../Credential/X509FileCredentialStore.php | 2 +- .../CompositeEntityDescriptorStore.php | 6 +- .../FixedEntityDescriptorStore.php | 2 +- src/LightSaml/Store/Id/IdArrayStore.php | 9 +- src/LightSaml/Store/Id/IdStoreInterface.php | 5 +- src/LightSaml/Store/Id/NullIdStore.php | 5 +- .../AbstractRequestStateArrayStore.php | 8 +- .../Store/Request/RequestStateArrayStore.php | 4 +- .../Request/RequestStateSessionStore.php | 9 +- .../Request/RequestStateStoreInterface.php | 2 - .../Store/Sso/SsoStateFixedStore.php | 2 - .../Store/Sso/SsoStateSessionStore.php | 5 +- .../Store/Sso/SsoStateStoreInterface.php | 2 - .../CompositeTrustOptionsStore.php | 4 +- .../TrustOptions/FixedTrustOptionsStore.php | 2 - .../TrustOptions/StaticTrustOptionsStore.php | 5 +- .../Assertion/AssertionTimeValidator.php | 20 ++-- .../AssertionTimeValidatorInterface.php | 5 +- .../Model/Assertion/AssertionValidator.php | 18 ---- .../Assertion/AssertionValidatorInterface.php | 2 - .../Model/NameId/NameIdValidator.php | 44 +-------- .../Model/NameId/NameIdValidatorInterface.php | 2 - .../Model/Signature/SignatureValidator.php | 16 ++-- .../Signature/SignatureValidatorInterface.php | 5 +- .../Model/Statement/StatementValidator.php | 4 - .../Statement/StatementValidatorInterface.php | 2 - .../Model/Subject/SubjectValidator.php | 7 -- .../Subject/SubjectValidatorInterface.php | 2 - .../Validator/Model/Xsd/XsdError.php | 2 - 208 files changed, 634 insertions(+), 1717 deletions(-) diff --git a/src/LightSaml/Action/ActionInterface.php b/src/LightSaml/Action/ActionInterface.php index d62dbc59..3f7318b5 100644 --- a/src/LightSaml/Action/ActionInterface.php +++ b/src/LightSaml/Action/ActionInterface.php @@ -15,8 +15,5 @@ interface ActionInterface { - /** - * @param ContextInterface $context - */ public function execute(ContextInterface $context); } diff --git a/src/LightSaml/Action/ActionLogWrapper.php b/src/LightSaml/Action/ActionLogWrapper.php index 95f41017..bd40a462 100644 --- a/src/LightSaml/Action/ActionLogWrapper.php +++ b/src/LightSaml/Action/ActionLogWrapper.php @@ -20,17 +20,12 @@ class ActionLogWrapper implements ActionWrapperInterface */ private $logger; - /** - * @param LoggerInterface $logger - */ public function __construct(LoggerInterface $logger) { $this->logger = $logger; } /** - * @param ActionInterface $action - * * @return ActionInterface */ public function wrap(ActionInterface $action) diff --git a/src/LightSaml/Action/ActionWrapperInterface.php b/src/LightSaml/Action/ActionWrapperInterface.php index 54c4b466..d8f3a7d5 100644 --- a/src/LightSaml/Action/ActionWrapperInterface.php +++ b/src/LightSaml/Action/ActionWrapperInterface.php @@ -14,8 +14,6 @@ interface ActionWrapperInterface { /** - * @param ActionInterface $action - * * @return ActionInterface */ public function wrap(ActionInterface $action); diff --git a/src/LightSaml/Action/Assertion/AbstractAssertionAction.php b/src/LightSaml/Action/Assertion/AbstractAssertionAction.php index ee1a031e..230fd69d 100644 --- a/src/LightSaml/Action/Assertion/AbstractAssertionAction.php +++ b/src/LightSaml/Action/Assertion/AbstractAssertionAction.php @@ -22,17 +22,11 @@ abstract class AbstractAssertionAction implements ActionInterface /** @var LoggerInterface */ protected $logger; - /** - * @param LoggerInterface $logger - */ public function __construct(LoggerInterface $logger) { $this->logger = $logger; } - /** - * @param ContextInterface $context - */ public function execute(ContextInterface $context) { if ($context instanceof AssertionContext) { @@ -42,8 +36,5 @@ public function execute(ContextInterface $context) } } - /** - * @param AssertionContext $context - */ abstract protected function doExecute(AssertionContext $context); } diff --git a/src/LightSaml/Action/Assertion/Inbound/AssertionIssuerFormatValidatorAction.php b/src/LightSaml/Action/Assertion/Inbound/AssertionIssuerFormatValidatorAction.php index f5342047..9b405d7e 100644 --- a/src/LightSaml/Action/Assertion/Inbound/AssertionIssuerFormatValidatorAction.php +++ b/src/LightSaml/Action/Assertion/Inbound/AssertionIssuerFormatValidatorAction.php @@ -24,8 +24,7 @@ class AssertionIssuerFormatValidatorAction extends AbstractAssertionAction private $expectedIssuerFormat = SamlConstants::NAME_ID_FORMAT_ENTITY; /** - * @param LoggerInterface $logger - * @param string $expectedIssuerFormat + * @param string $expectedIssuerFormat */ public function __construct(LoggerInterface $logger, $expectedIssuerFormat) { @@ -34,9 +33,6 @@ public function __construct(LoggerInterface $logger, $expectedIssuerFormat) $this->expectedIssuerFormat = $expectedIssuerFormat; } - /** - * @param AssertionContext $context - */ protected function doExecute(AssertionContext $context) { if (null == $context->getAssertion()->getIssuer()) { diff --git a/src/LightSaml/Action/Assertion/Inbound/AssertionSignatureValidatorAction.php b/src/LightSaml/Action/Assertion/Inbound/AssertionSignatureValidatorAction.php index 3418347d..a79285a0 100644 --- a/src/LightSaml/Action/Assertion/Inbound/AssertionSignatureValidatorAction.php +++ b/src/LightSaml/Action/Assertion/Inbound/AssertionSignatureValidatorAction.php @@ -31,9 +31,7 @@ class AssertionSignatureValidatorAction extends AbstractAssertionAction protected $requireSignature; /** - * @param LoggerInterface $logger - * @param SignatureValidatorInterface $signatureValidator - * @param bool $requireSignature + * @param bool $requireSignature */ public function __construct(LoggerInterface $logger, SignatureValidatorInterface $signatureValidator, $requireSignature = true) { @@ -44,8 +42,6 @@ public function __construct(LoggerInterface $logger, SignatureValidatorInterface } /** - * @param AssertionContext $context - * * @return void */ protected function doExecute(AssertionContext $context) @@ -70,9 +66,9 @@ protected function doExecute(AssertionContext $context) $keyNames = $credential->getKeyNames(); $this->logger->debug( sprintf('Assertion signature validated with key "%s"', implode(', ', $keyNames)), - LogHelper::getActionContext($context, $this, array( + LogHelper::getActionContext($context, $this, [ 'credential' => $credential, - )) + ]) ); } else { $this->logger->warning( diff --git a/src/LightSaml/Action/Assertion/Inbound/AssertionValidatorAction.php b/src/LightSaml/Action/Assertion/Inbound/AssertionValidatorAction.php index 9cb7ff49..fc6c1635 100644 --- a/src/LightSaml/Action/Assertion/Inbound/AssertionValidatorAction.php +++ b/src/LightSaml/Action/Assertion/Inbound/AssertionValidatorAction.php @@ -21,10 +21,6 @@ class AssertionValidatorAction extends AbstractAssertionAction /** @var AssertionValidatorInterface */ protected $assertionValidator; - /** - * @param LoggerInterface $logger - * @param AssertionValidatorInterface $assertionValidator - */ public function __construct(LoggerInterface $logger, AssertionValidatorInterface $assertionValidator) { parent::__construct($logger); @@ -32,9 +28,6 @@ public function __construct(LoggerInterface $logger, AssertionValidatorInterface $this->assertionValidator = $assertionValidator; } - /** - * @param AssertionContext $context - */ protected function doExecute(AssertionContext $context) { $this->assertionValidator->validateAssertion($context->getAssertion()); diff --git a/src/LightSaml/Action/Assertion/Inbound/InResponseToValidatorAction.php b/src/LightSaml/Action/Assertion/Inbound/InResponseToValidatorAction.php index 11462fac..b4ba48f7 100644 --- a/src/LightSaml/Action/Assertion/Inbound/InResponseToValidatorAction.php +++ b/src/LightSaml/Action/Assertion/Inbound/InResponseToValidatorAction.php @@ -25,10 +25,6 @@ class InResponseToValidatorAction extends AbstractAssertionAction /** @var RequestStateStoreInterface */ protected $requestStore; - /** - * @param LoggerInterface $logger - * @param RequestStateStoreInterface $requestStore - */ public function __construct(LoggerInterface $logger, RequestStateStoreInterface $requestStore) { parent::__construct($logger); @@ -36,9 +32,6 @@ public function __construct(LoggerInterface $logger, RequestStateStoreInterface $this->requestStore = $requestStore; } - /** - * @param AssertionContext $context - */ protected function doExecute(AssertionContext $context) { if (null === $context->getAssertion()->getSubject()) { @@ -62,8 +55,7 @@ protected function doExecute(AssertionContext $context) } /** - * @param string $inResponseTo - * @param AssertionContext $context + * @param string $inResponseTo * * @return \LightSaml\State\Request\RequestState */ diff --git a/src/LightSaml/Action/Assertion/Inbound/KnownAssertionIssuerAction.php b/src/LightSaml/Action/Assertion/Inbound/KnownAssertionIssuerAction.php index 4aa46991..dbf0baa7 100644 --- a/src/LightSaml/Action/Assertion/Inbound/KnownAssertionIssuerAction.php +++ b/src/LightSaml/Action/Assertion/Inbound/KnownAssertionIssuerAction.php @@ -23,10 +23,6 @@ class KnownAssertionIssuerAction extends AbstractAssertionAction /** @var EntityDescriptorStoreInterface */ private $idpEntityDescriptorProvider; - /** - * @param LoggerInterface $logger - * @param EntityDescriptorStoreInterface $idpEntityDescriptorProvider - */ public function __construct(LoggerInterface $logger, EntityDescriptorStoreInterface $idpEntityDescriptorProvider) { parent::__construct($logger); @@ -35,8 +31,6 @@ public function __construct(LoggerInterface $logger, EntityDescriptorStoreInterf } /** - * @param AssertionContext $context - * * @return void */ protected function doExecute(AssertionContext $context) diff --git a/src/LightSaml/Action/Assertion/Inbound/RecipientValidatorAction.php b/src/LightSaml/Action/Assertion/Inbound/RecipientValidatorAction.php index f5be4412..504dad22 100644 --- a/src/LightSaml/Action/Assertion/Inbound/RecipientValidatorAction.php +++ b/src/LightSaml/Action/Assertion/Inbound/RecipientValidatorAction.php @@ -30,10 +30,6 @@ class RecipientValidatorAction extends AbstractAssertionAction /** @var EndpointResolverInterface */ private $endpointResolver; - /** - * @param LoggerInterface $logger - * @param EndpointResolverInterface $endpointResolver - */ public function __construct(LoggerInterface $logger, EndpointResolverInterface $endpointResolver) { parent::__construct($logger); @@ -42,8 +38,6 @@ public function __construct(LoggerInterface $logger, EndpointResolverInterface $ } /** - * @param AssertionContext $context - * * @return void */ protected function doExecute(AssertionContext $context) @@ -53,9 +47,6 @@ protected function doExecute(AssertionContext $context) } } - /** - * @param AssertionContext $context - */ protected function validateBearerAssertion(AssertionContext $context) { foreach ($context->getAssertion()->getSubject()->getBearerConfirmations() as $subjectConfirmation) { @@ -63,10 +54,6 @@ protected function validateBearerAssertion(AssertionContext $context) } } - /** - * @param AssertionContext $context - * @param SubjectConfirmation $subjectConfirmation - */ protected function validateSubjectConfirmation(AssertionContext $context, SubjectConfirmation $subjectConfirmation) { $recipient = $subjectConfirmation->getSubjectConfirmationData()->getRecipient(); diff --git a/src/LightSaml/Action/Assertion/Inbound/RepeatedIdValidatorAction.php b/src/LightSaml/Action/Assertion/Inbound/RepeatedIdValidatorAction.php index d1526c53..2f85af58 100644 --- a/src/LightSaml/Action/Assertion/Inbound/RepeatedIdValidatorAction.php +++ b/src/LightSaml/Action/Assertion/Inbound/RepeatedIdValidatorAction.php @@ -29,10 +29,6 @@ class RepeatedIdValidatorAction extends AbstractAssertionAction /** @var IdStoreInterface */ protected $idStore; - /** - * @param LoggerInterface $logger - * @param IdStoreInterface $idStore - */ public function __construct(LoggerInterface $logger, IdStoreInterface $idStore) { parent::__construct($logger); @@ -41,8 +37,6 @@ public function __construct(LoggerInterface $logger, IdStoreInterface $idStore) } /** - * @param AssertionContext $context - * * @return void */ protected function doExecute(AssertionContext $context) @@ -53,8 +47,6 @@ protected function doExecute(AssertionContext $context) } /** - * @param AssertionContext $context - * * @throws \LightSaml\Error\LightSamlContextException */ protected function validateBearerAssertion(AssertionContext $context) @@ -92,8 +84,6 @@ protected function validateBearerAssertion(AssertionContext $context) } /** - * @param AssertionContext $context - * * @throws \LogicException * @throws \LightSaml\Error\LightSamlValidationException * diff --git a/src/LightSaml/Action/Assertion/Inbound/TimeValidatorAction.php b/src/LightSaml/Action/Assertion/Inbound/TimeValidatorAction.php index b5611e6e..8a2cce8b 100644 --- a/src/LightSaml/Action/Assertion/Inbound/TimeValidatorAction.php +++ b/src/LightSaml/Action/Assertion/Inbound/TimeValidatorAction.php @@ -29,10 +29,7 @@ class TimeValidatorAction extends AbstractAssertionAction protected $allowedSecondsSkew; /** - * @param LoggerInterface $logger - * @param AssertionTimeValidatorInterface $assertionTimeValidator - * @param TimeProviderInterface $timeProvider - * @param int $allowedSecondsSkew + * @param int $allowedSecondsSkew */ public function __construct( LoggerInterface $logger, @@ -48,8 +45,6 @@ public function __construct( } /** - * @param AssertionContext $context - * * @return void */ protected function doExecute(AssertionContext $context) diff --git a/src/LightSaml/Action/CatchableErrorAction.php b/src/LightSaml/Action/CatchableErrorAction.php index 9b8dee78..7d6215f6 100644 --- a/src/LightSaml/Action/CatchableErrorAction.php +++ b/src/LightSaml/Action/CatchableErrorAction.php @@ -23,10 +23,6 @@ class CatchableErrorAction implements ActionInterface /** @var ActionInterface */ protected $errorAction; - /** - * @param ActionInterface $mainAction - * @param ActionInterface $errorAction - */ public function __construct(ActionInterface $mainAction, ActionInterface $errorAction) { $this->mainAction = $mainAction; @@ -34,8 +30,6 @@ public function __construct(ActionInterface $mainAction, ActionInterface $errorA } /** - * @param ContextInterface $context - * * @return void */ public function execute(ContextInterface $context) diff --git a/src/LightSaml/Action/CompositeAction.php b/src/LightSaml/Action/CompositeAction.php index 085de86f..f2042983 100644 --- a/src/LightSaml/Action/CompositeAction.php +++ b/src/LightSaml/Action/CompositeAction.php @@ -16,12 +16,12 @@ class CompositeAction implements ActionInterface, DebugPrintTreeActionInterface, CompositeActionInterface { /** @var ActionInterface[] */ - protected $children = array(); + protected $children = []; /** * @param ActionInterface[] $children */ - public function __construct(array $children = array()) + public function __construct(array $children = []) { foreach ($children as $action) { $this->add($action); @@ -37,8 +37,6 @@ public function getChildren() } /** - * @param ActionInterface $action - * * @return CompositeAction */ public function add(ActionInterface $action) @@ -64,8 +62,6 @@ public function map($callable) } /** - * @param ContextInterface $context - * * @return void */ public function execute(ContextInterface $context) @@ -80,18 +76,18 @@ public function execute(ContextInterface $context) */ public function debugPrintTree() { - $arr = array(); + $arr = []; foreach ($this->children as $childAction) { if ($childAction instanceof DebugPrintTreeActionInterface) { $arr = array_merge($arr, $childAction->debugPrintTree()); } else { - $arr = array_merge($arr, array(get_class($childAction) => array())); + $arr = array_merge($arr, [get_class($childAction) => []]); } } - $result = array( + $result = [ static::class => $arr, - ); + ]; return $result; } diff --git a/src/LightSaml/Action/CompositeActionInterface.php b/src/LightSaml/Action/CompositeActionInterface.php index e947f444..5e5544e2 100644 --- a/src/LightSaml/Action/CompositeActionInterface.php +++ b/src/LightSaml/Action/CompositeActionInterface.php @@ -14,8 +14,6 @@ interface CompositeActionInterface extends ActionInterface { /** - * @param ActionInterface $action - * * @return CompositeActionInterface */ public function add(ActionInterface $action); diff --git a/src/LightSaml/Action/DispatchEventAction.php b/src/LightSaml/Action/DispatchEventAction.php index f9c1851b..1c426bcb 100644 --- a/src/LightSaml/Action/DispatchEventAction.php +++ b/src/LightSaml/Action/DispatchEventAction.php @@ -24,8 +24,7 @@ class DispatchEventAction implements ActionInterface protected $event; /** - * @param EventDispatcherInterface $eventDispatcher - * @param string $event + * @param string $event */ public function __construct(EventDispatcherInterface $eventDispatcher, $event) { @@ -34,8 +33,6 @@ public function __construct(EventDispatcherInterface $eventDispatcher, $event) } /** - * @param ContextInterface $context - * * @return void */ public function execute(ContextInterface $context) diff --git a/src/LightSaml/Action/LoggableAction.php b/src/LightSaml/Action/LoggableAction.php index 6c04ec10..6e55620b 100644 --- a/src/LightSaml/Action/LoggableAction.php +++ b/src/LightSaml/Action/LoggableAction.php @@ -21,10 +21,6 @@ class LoggableAction extends WrappedAction */ private $logger; - /** - * @param ActionInterface $action - * @param LoggerInterface $logger - */ public function __construct(ActionInterface $action, LoggerInterface $logger) { parent::__construct($action); @@ -32,20 +28,14 @@ public function __construct(ActionInterface $action, LoggerInterface $logger) $this->logger = $logger; } - /** - * @param ContextInterface $context - */ protected function beforeAction(ContextInterface $context) { - $this->logger->debug(sprintf('Executing action "%s"', get_class($this->action)), array( + $this->logger->debug(sprintf('Executing action "%s"', get_class($this->action)), [ 'context' => $context, 'action' => $this->action, - )); + ]); } - /** - * @param ContextInterface $context - */ protected function afterAction(ContextInterface $context) { } diff --git a/src/LightSaml/Action/NullAction.php b/src/LightSaml/Action/NullAction.php index cbc1d8ac..7a4c2e4a 100644 --- a/src/LightSaml/Action/NullAction.php +++ b/src/LightSaml/Action/NullAction.php @@ -16,8 +16,6 @@ class NullAction implements ActionInterface { /** - * @param ContextInterface $context - * * @return void */ public function execute(ContextInterface $context) diff --git a/src/LightSaml/Action/Profile/AbstractProfileAction.php b/src/LightSaml/Action/Profile/AbstractProfileAction.php index 9c74ca6c..3447c370 100644 --- a/src/LightSaml/Action/Profile/AbstractProfileAction.php +++ b/src/LightSaml/Action/Profile/AbstractProfileAction.php @@ -22,17 +22,12 @@ abstract class AbstractProfileAction implements ActionInterface /** @var LoggerInterface */ protected $logger; - /** - * @param LoggerInterface $logger - */ public function __construct(LoggerInterface $logger) { $this->logger = $logger; } /** - * @param ContextInterface $context - * * @return void */ public function execute(ContextInterface $context) @@ -41,7 +36,7 @@ public function execute(ContextInterface $context) $this->doExecute($context); } else { $message = sprintf('Expected ProfileContext but got %s', get_class($context)); - $this->logger->emergency($message, array('context' => $context)); + $this->logger->emergency($message, ['context' => $context]); throw new LightSamlContextException($context, $message); } } diff --git a/src/LightSaml/Action/Profile/Entity/SerializeOwnEntityAction.php b/src/LightSaml/Action/Profile/Entity/SerializeOwnEntityAction.php index a69dcf54..0653bf19 100644 --- a/src/LightSaml/Action/Profile/Entity/SerializeOwnEntityAction.php +++ b/src/LightSaml/Action/Profile/Entity/SerializeOwnEntityAction.php @@ -20,11 +20,8 @@ class SerializeOwnEntityAction extends AbstractProfileAction { /** @var string[] */ - protected $supportedContextTypes = array('application/samlmetadata+xml', 'application/xml', 'text/xml'); + protected $supportedContextTypes = ['application/samlmetadata+xml', 'application/xml', 'text/xml']; - /** - * @param ProfileContext $context - */ protected function doExecute(ProfileContext $context) { $ownEntityDescriptor = $context->getOwnEntityDescriptor(); @@ -48,7 +45,7 @@ protected function doExecute(ProfileContext $context) } } - $response->headers->replace(array('Content-Type' => $contentType)); + $response->headers->replace(['Content-Type' => $contentType]); $context->getHttpResponseContext()->setResponse($response); } diff --git a/src/LightSaml/Action/Profile/FlushRequestStatesAction.php b/src/LightSaml/Action/Profile/FlushRequestStatesAction.php index b8a50eb6..603f1a9c 100644 --- a/src/LightSaml/Action/Profile/FlushRequestStatesAction.php +++ b/src/LightSaml/Action/Profile/FlushRequestStatesAction.php @@ -14,8 +14,8 @@ use LightSaml\Context\ContextInterface; use LightSaml\Context\Profile\AssertionContext; use LightSaml\Context\Profile\Helper\LogHelper; -use LightSaml\Context\Profile\ProfileContexts; use LightSaml\Context\Profile\ProfileContext; +use LightSaml\Context\Profile\ProfileContexts; use LightSaml\Context\Profile\RequestStateContext; use LightSaml\Store\Request\RequestStateStoreInterface; use Psr\Log\LoggerInterface; @@ -25,10 +25,6 @@ class FlushRequestStatesAction extends AbstractProfileAction /** @var RequestStateStoreInterface */ protected $requestStore; - /** - * @param LoggerInterface $logger - * @param RequestStateStoreInterface $requestStore - */ public function __construct(LoggerInterface $logger, RequestStateStoreInterface $requestStore) { parent::__construct($logger); @@ -37,8 +33,6 @@ public function __construct(LoggerInterface $logger, RequestStateStoreInterface } /** - * @param ProfileContext $context - * * @return void */ protected function doExecute(ProfileContext $context) diff --git a/src/LightSaml/Action/Profile/Inbound/Message/AbstractDestinationValidatorAction.php b/src/LightSaml/Action/Profile/Inbound/Message/AbstractDestinationValidatorAction.php index ab2bb2e7..e5bd4e98 100644 --- a/src/LightSaml/Action/Profile/Inbound/Message/AbstractDestinationValidatorAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Message/AbstractDestinationValidatorAction.php @@ -29,10 +29,6 @@ abstract class AbstractDestinationValidatorAction extends AbstractProfileAction /** @var EndpointResolverInterface */ protected $endpointResolver; - /** - * @param LoggerInterface $logger - * @param EndpointResolverInterface $endpointResolver - */ public function __construct(LoggerInterface $logger, EndpointResolverInterface $endpointResolver) { parent::__construct($logger); @@ -41,8 +37,6 @@ public function __construct(LoggerInterface $logger, EndpointResolverInterface $ } /** - * @param ProfileContext $context - * * @return void */ protected function doExecute(ProfileContext $context) @@ -67,8 +61,7 @@ protected function doExecute(ProfileContext $context) } /** - * @param ProfileContext $context - * @param string $location + * @param string $location * * @return CriteriaSet */ diff --git a/src/LightSaml/Action/Profile/Inbound/Message/AssertBindingTypeAction.php b/src/LightSaml/Action/Profile/Inbound/Message/AssertBindingTypeAction.php index 108c4cb6..26b87098 100644 --- a/src/LightSaml/Action/Profile/Inbound/Message/AssertBindingTypeAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Message/AssertBindingTypeAction.php @@ -23,8 +23,7 @@ class AssertBindingTypeAction extends AbstractProfileAction protected $expectedBindingTypes; /** - * @param LoggerInterface $logger - * @param string[] $expectedBindingTypes + * @param string[] $expectedBindingTypes */ public function __construct(LoggerInterface $logger, array $expectedBindingTypes) { @@ -33,9 +32,6 @@ public function __construct(LoggerInterface $logger, array $expectedBindingTypes $this->expectedBindingTypes = $expectedBindingTypes; } - /** - * @param ProfileContext $context - */ protected function doExecute(ProfileContext $context) { if (false === in_array($context->getInboundContext()->getBindingType(), $this->expectedBindingTypes)) { @@ -44,10 +40,10 @@ protected function doExecute(ProfileContext $context) $context->getInboundContext()->getBindingType(), implode(' ', $this->expectedBindingTypes) ); - $this->logger->critical($message, LogHelper::getActionErrorContext($context, $this, array( + $this->logger->critical($message, LogHelper::getActionErrorContext($context, $this, [ 'actualBindingType' => $context->getInboundContext()->getBindingType(), 'expectedBindingTypes' => $this->expectedBindingTypes, - ))); + ])); throw new LightSamlContextException($context, $message); } diff --git a/src/LightSaml/Action/Profile/Inbound/Message/DestinationValidatorAuthnRequestAction.php b/src/LightSaml/Action/Profile/Inbound/Message/DestinationValidatorAuthnRequestAction.php index 742d47ec..016567b2 100644 --- a/src/LightSaml/Action/Profile/Inbound/Message/DestinationValidatorAuthnRequestAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Message/DestinationValidatorAuthnRequestAction.php @@ -19,8 +19,7 @@ class DestinationValidatorAuthnRequestAction extends AbstractDestinationValidatorAction { /** - * @param ProfileContext $context - * @param string $location + * @param string $location * * @return CriteriaSet */ diff --git a/src/LightSaml/Action/Profile/Inbound/Message/DestinationValidatorResponseAction.php b/src/LightSaml/Action/Profile/Inbound/Message/DestinationValidatorResponseAction.php index 20c5a38c..5c310763 100644 --- a/src/LightSaml/Action/Profile/Inbound/Message/DestinationValidatorResponseAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Message/DestinationValidatorResponseAction.php @@ -19,8 +19,7 @@ class DestinationValidatorResponseAction extends AbstractDestinationValidatorAction { /** - * @param ProfileContext $context - * @param string $location + * @param string $location * * @return CriteriaSet */ diff --git a/src/LightSaml/Action/Profile/Inbound/Message/IssuerValidatorAction.php b/src/LightSaml/Action/Profile/Inbound/Message/IssuerValidatorAction.php index 225b3390..955f9cdc 100644 --- a/src/LightSaml/Action/Profile/Inbound/Message/IssuerValidatorAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Message/IssuerValidatorAction.php @@ -29,9 +29,7 @@ class IssuerValidatorAction extends AbstractProfileAction protected $allowedFormat; /** - * @param LoggerInterface $logger - * @param NameIdValidatorInterface $nameIdValidator - * @param string $allowedFormat + * @param string $allowedFormat */ public function __construct(LoggerInterface $logger, NameIdValidatorInterface $nameIdValidator, $allowedFormat) { @@ -42,8 +40,6 @@ public function __construct(LoggerInterface $logger, NameIdValidatorInterface $n } /** - * @param ProfileContext $context - * * @return void */ protected function doExecute(ProfileContext $context) diff --git a/src/LightSaml/Action/Profile/Inbound/Message/MessageSignatureValidatorAction.php b/src/LightSaml/Action/Profile/Inbound/Message/MessageSignatureValidatorAction.php index 03c882d1..5279c599 100644 --- a/src/LightSaml/Action/Profile/Inbound/Message/MessageSignatureValidatorAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Message/MessageSignatureValidatorAction.php @@ -15,9 +15,9 @@ use LightSaml\Context\Profile\Helper\LogHelper; use LightSaml\Context\Profile\Helper\MessageContextHelper; use LightSaml\Context\Profile\ProfileContext; +use LightSaml\Credential\Criteria\MetadataCriteria; use LightSaml\Error\LightSamlModelException; use LightSaml\Model\XmlDSig\AbstractSignatureReader; -use LightSaml\Credential\Criteria\MetadataCriteria; use LightSaml\Validator\Model\Signature\SignatureValidatorInterface; use Psr\Log\LoggerInterface; @@ -29,10 +29,6 @@ class MessageSignatureValidatorAction extends AbstractProfileAction /** @var SignatureValidatorInterface */ protected $signatureValidator; - /** - * @param LoggerInterface $logger - * @param SignatureValidatorInterface $signatureValidator - */ public function __construct(LoggerInterface $logger, SignatureValidatorInterface $signatureValidator) { parent::__construct($logger); @@ -41,8 +37,6 @@ public function __construct(LoggerInterface $logger, SignatureValidatorInterface } /** - * @param ProfileContext $context - * * @return void */ protected function doExecute(ProfileContext $context) @@ -63,9 +57,9 @@ protected function doExecute(ProfileContext $context) $keyNames = $credential->getKeyNames(); $this->logger->debug( sprintf('Message signature validated with key "%s"', implode(', ', $keyNames)), - LogHelper::getActionContext($context, $this, array( + LogHelper::getActionContext($context, $this, [ 'credential' => $credential, - )) + ]) ); } else { $this->logger->warning( diff --git a/src/LightSaml/Action/Profile/Inbound/Message/ReceiveMessageAction.php b/src/LightSaml/Action/Profile/Inbound/Message/ReceiveMessageAction.php index 517df6c5..2a7aa647 100644 --- a/src/LightSaml/Action/Profile/Inbound/Message/ReceiveMessageAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Message/ReceiveMessageAction.php @@ -27,10 +27,6 @@ class ReceiveMessageAction extends AbstractProfileAction /** @var BindingFactoryInterface */ protected $bindingFactory; - /** - * @param LoggerInterface $logger - * @param BindingFactoryInterface $bindingFactory - */ public function __construct(LoggerInterface $logger, BindingFactoryInterface $bindingFactory) { parent::__construct($logger); @@ -39,8 +35,6 @@ public function __construct(LoggerInterface $logger, BindingFactoryInterface $bi } /** - * @param ProfileContext $context - * * @return void */ protected function doExecute(ProfileContext $context) @@ -60,9 +54,9 @@ protected function doExecute(ProfileContext $context) $this->logger->info( 'Received message', - LogHelper::getActionContext($context, $this, array( + LogHelper::getActionContext($context, $this, [ 'message' => $context->getInboundContext()->getDeserializationContext()->getDocument()->saveXML(), - )) + ]) ); } } diff --git a/src/LightSaml/Action/Profile/Inbound/Message/ResolvePartyEntityIdAction.php b/src/LightSaml/Action/Profile/Inbound/Message/ResolvePartyEntityIdAction.php index e21570e1..1adac58f 100644 --- a/src/LightSaml/Action/Profile/Inbound/Message/ResolvePartyEntityIdAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Message/ResolvePartyEntityIdAction.php @@ -34,12 +34,6 @@ class ResolvePartyEntityIdAction extends AbstractProfileAction /** @var TrustOptionsStoreInterface */ protected $trustOptionsProvider; - /** - * @param LoggerInterface $logger - * @param EntityDescriptorStoreInterface $spEntityDescriptorProvider - * @param EntityDescriptorStoreInterface $idpEntityDescriptorProvider - * @param TrustOptionsStoreInterface $trustOptionsProvider - */ public function __construct( LoggerInterface $logger, EntityDescriptorStoreInterface $spEntityDescriptorProvider, @@ -53,9 +47,6 @@ public function __construct( $this->trustOptionsProvider = $trustOptionsProvider; } - /** - * @param ProfileContext $context - */ protected function doExecute(ProfileContext $context) { $partyContext = $context->getPartyEntityContext(); @@ -63,9 +54,9 @@ protected function doExecute(ProfileContext $context) if ($partyContext->getEntityDescriptor() && $partyContext->getTrustOptions()) { $this->logger->debug( sprintf('Party EntityDescriptor and TrustOptions already set for "%s"', $partyContext->getEntityDescriptor()->getEntityID()), - LogHelper::getActionContext($context, $this, array( + LogHelper::getActionContext($context, $this, [ 'partyEntityId' => $partyContext->getEntityDescriptor()->getEntityID(), - )) + ]) ); return; @@ -90,9 +81,9 @@ protected function doExecute(ProfileContext $context) $partyContext->setEntityDescriptor($partyEntityDescriptor); $this->logger->debug( sprintf('Known issuer resolved: "%s"', $partyEntityDescriptor->getEntityID()), - LogHelper::getActionContext($context, $this, array( + LogHelper::getActionContext($context, $this, [ 'partyEntityId' => $partyEntityDescriptor->getEntityID(), - )) + ]) ); } @@ -106,9 +97,7 @@ protected function doExecute(ProfileContext $context) } /** - * @param ProfileContext $context - * @param EntityDescriptorStoreInterface $entityDescriptorProvider - * @param string $entityId + * @param string $entityId * * @return \LightSaml\Model\Metadata\EntityDescriptor */ diff --git a/src/LightSaml/Action/Profile/Inbound/Response/AssertionAction.php b/src/LightSaml/Action/Profile/Inbound/Response/AssertionAction.php index 3f91539a..539174d7 100644 --- a/src/LightSaml/Action/Profile/Inbound/Response/AssertionAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Response/AssertionAction.php @@ -24,10 +24,6 @@ class AssertionAction extends AbstractProfileAction implements DebugPrintTreeAct /** @var ActionInterface */ private $assertionAction; - /** - * @param LoggerInterface $logger - * @param ActionInterface $assertionAction - */ public function __construct(LoggerInterface $logger, ActionInterface $assertionAction) { parent::__construct($logger); @@ -35,9 +31,6 @@ public function __construct(LoggerInterface $logger, ActionInterface $assertionA $this->assertionAction = $assertionAction; } - /** - * @param ProfileContext $context - */ protected function doExecute(ProfileContext $context) { $response = MessageContextHelper::asResponse($context->getInboundContext()); @@ -62,16 +55,16 @@ protected function doExecute(ProfileContext $context) */ public function debugPrintTree($depth = 0) { - $arr = array(); + $arr = []; if ($this->assertionAction instanceof DebugPrintTreeActionInterface) { $arr = array_merge($arr, $this->assertionAction->debugPrintTree()); } else { - $arr[get_class($this->assertionAction)] = array(); + $arr[get_class($this->assertionAction)] = []; } - $result = array( + $result = [ static::class => $arr, - ); + ]; return $result; } diff --git a/src/LightSaml/Action/Profile/Inbound/Response/DecryptAssertionsAction.php b/src/LightSaml/Action/Profile/Inbound/Response/DecryptAssertionsAction.php index ae707dc9..879c88f3 100644 --- a/src/LightSaml/Action/Profile/Inbound/Response/DecryptAssertionsAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Response/DecryptAssertionsAction.php @@ -12,19 +12,19 @@ namespace LightSaml\Action\Profile\Inbound\Response; use LightSaml\Action\Profile\AbstractProfileAction; -use LightSaml\Error\LightSamlContextException; -use LightSaml\Model\Context\DeserializationContext; use LightSaml\Context\Profile\Helper\LogHelper; use LightSaml\Context\Profile\Helper\MessageContextHelper; use LightSaml\Context\Profile\ProfileContext; -use LightSaml\Model\Assertion\EncryptedAssertionReader; -use LightSaml\Resolver\Credential\CredentialResolverInterface; -use LightSaml\SamlConstants; use LightSaml\Credential\CredentialInterface; -use LightSaml\Credential\UsageType; use LightSaml\Credential\Criteria\EntityIdCriteria; use LightSaml\Credential\Criteria\MetadataCriteria; use LightSaml\Credential\Criteria\UsageCriteria; +use LightSaml\Credential\UsageType; +use LightSaml\Error\LightSamlContextException; +use LightSaml\Model\Assertion\EncryptedAssertionReader; +use LightSaml\Model\Context\DeserializationContext; +use LightSaml\Resolver\Credential\CredentialResolverInterface; +use LightSaml\SamlConstants; use Psr\Log\LoggerInterface; class DecryptAssertionsAction extends AbstractProfileAction @@ -32,10 +32,6 @@ class DecryptAssertionsAction extends AbstractProfileAction /** @var CredentialResolverInterface */ protected $credentialResolver; - /** - * @param LoggerInterface $logger - * @param CredentialResolverInterface $credentialResolver - */ public function __construct(LoggerInterface $logger, CredentialResolverInterface $credentialResolver) { parent::__construct($logger); @@ -43,9 +39,6 @@ public function __construct(LoggerInterface $logger, CredentialResolverInterface $this->credentialResolver = $credentialResolver; } - /** - * @param ProfileContext $context - */ protected function doExecute(ProfileContext $context) { $response = MessageContextHelper::asResponse($context->getInboundContext()); @@ -76,7 +69,7 @@ protected function doExecute(ProfileContext $context) $this->logger->emergency($message, LogHelper::getActionErrorContext($context, $this)); throw new LightSamlContextException($context, $message); } - $this->logger->info('Trusted decryption candidates', LogHelper::getActionContext($context, $this, array( + $this->logger->info('Trusted decryption candidates', LogHelper::getActionContext($context, $this, [ 'credentials' => array_map(function (CredentialInterface $credential) { return sprintf( "Entity: '%s'; PK X509 Thumb: '%s'", @@ -84,7 +77,7 @@ protected function doExecute(ProfileContext $context) $credential->getPublicKey() ? $credential->getPublicKey()->getX509Thumbprint() : '' ); }, $privateKeys), - ))); + ])); foreach ($response->getAllEncryptedAssertions() as $index => $encryptedAssertion) { if ($encryptedAssertion instanceof EncryptedAssertionReader) { @@ -96,9 +89,9 @@ protected function doExecute(ProfileContext $context) $this->logger->info( 'Assertion decrypted', - LogHelper::getActionContext($context, $this, array( + LogHelper::getActionContext($context, $this, [ 'assertion' => $deserializationContext->getDocument()->saveXML(), - )) + ]) ); } } diff --git a/src/LightSaml/Action/Profile/Inbound/Response/SpSsoStateAction.php b/src/LightSaml/Action/Profile/Inbound/Response/SpSsoStateAction.php index edd2b4e2..8392981b 100644 --- a/src/LightSaml/Action/Profile/Inbound/Response/SpSsoStateAction.php +++ b/src/LightSaml/Action/Profile/Inbound/Response/SpSsoStateAction.php @@ -29,9 +29,6 @@ public function __construct(LoggerInterface $logger, SessionProcessorInterface $ $this->sessionProcessor = $sessionProcessor; } - /** - * @param ProfileContext $context - */ protected function doExecute(ProfileContext $context) { $response = MessageContextHelper::asResponse($context->getInboundContext()); diff --git a/src/LightSaml/Action/Profile/Inbound/StatusResponse/InResponseToValidatorAction.php b/src/LightSaml/Action/Profile/Inbound/StatusResponse/InResponseToValidatorAction.php index 2bd7ef2d..b386ddc4 100644 --- a/src/LightSaml/Action/Profile/Inbound/StatusResponse/InResponseToValidatorAction.php +++ b/src/LightSaml/Action/Profile/Inbound/StatusResponse/InResponseToValidatorAction.php @@ -13,9 +13,9 @@ use LightSaml\Action\Profile\AbstractProfileAction; use LightSaml\Context\Profile\Helper\LogHelper; -use LightSaml\Context\Profile\ProfileContexts; use LightSaml\Context\Profile\Helper\MessageContextHelper; use LightSaml\Context\Profile\ProfileContext; +use LightSaml\Context\Profile\ProfileContexts; use LightSaml\Context\Profile\RequestStateContext; use LightSaml\Error\LightSamlContextException; use LightSaml\State\Request\RequestStateParameters; @@ -27,10 +27,6 @@ class InResponseToValidatorAction extends AbstractProfileAction /** @var RequestStateStoreInterface */ protected $requestStore; - /** - * @param LoggerInterface $logger - * @param RequestStateStoreInterface $requestStore - */ public function __construct(LoggerInterface $logger, RequestStateStoreInterface $requestStore) { parent::__construct($logger); @@ -38,9 +34,6 @@ public function __construct(LoggerInterface $logger, RequestStateStoreInterface $this->requestStore = $requestStore; } - /** - * @param ProfileContext $context - */ protected function doExecute(ProfileContext $context) { $response = MessageContextHelper::asStatusResponse($context->getInboundContext()); @@ -49,18 +42,18 @@ protected function doExecute(ProfileContext $context) $requestState = $this->requestStore->get($inResponseTo); if (null == $requestState) { $message = sprintf("Unknown InResponseTo '%s'", $inResponseTo); - $this->logger->critical($message, LogHelper::getActionErrorContext($context, $this, array( + $this->logger->critical($message, LogHelper::getActionErrorContext($context, $this, [ 'in_response_to' => $inResponseTo, - ))); + ])); throw new LightSamlContextException($context, $message); } $sentToParty = $requestState->getParameters()->get(RequestStateParameters::PARTY); if ($sentToParty && $response->getIssuer() && $response->getIssuer()->getValue() != $sentToParty) { $message = sprintf('AuthnRequest with id "%s" sent to party "%s" but StatusResponse for that request issued by party "%s"', $inResponseTo, $sentToParty, $response->getIssuer()->getValue()); - $this->logger->critical($message, LogHelper::getActionErrorContext($context, $this, array( + $this->logger->critical($message, LogHelper::getActionErrorContext($context, $this, [ 'sent_to' => $sentToParty, 'received_from' => $response->getIssuer()->getValue(), - ))); + ])); throw new LightSamlContextException($context, $message); } diff --git a/src/LightSaml/Action/Profile/Outbound/Message/CreateMessageIssuerAction.php b/src/LightSaml/Action/Profile/Outbound/Message/CreateMessageIssuerAction.php index 6a720978..ea684fe4 100644 --- a/src/LightSaml/Action/Profile/Outbound/Message/CreateMessageIssuerAction.php +++ b/src/LightSaml/Action/Profile/Outbound/Message/CreateMessageIssuerAction.php @@ -24,8 +24,6 @@ class CreateMessageIssuerAction extends AbstractProfileAction { /** - * @param ProfileContext $context - * * @return void */ protected function doExecute(ProfileContext $context) diff --git a/src/LightSaml/Action/Profile/Outbound/Message/DestinationAction.php b/src/LightSaml/Action/Profile/Outbound/Message/DestinationAction.php index ad8d8e25..a133dd09 100644 --- a/src/LightSaml/Action/Profile/Outbound/Message/DestinationAction.php +++ b/src/LightSaml/Action/Profile/Outbound/Message/DestinationAction.php @@ -22,8 +22,6 @@ class DestinationAction extends AbstractProfileAction { /** - * @param ProfileContext $context - * * @return void */ protected function doExecute(ProfileContext $context) diff --git a/src/LightSaml/Action/Profile/Outbound/Message/MessageIdAction.php b/src/LightSaml/Action/Profile/Outbound/Message/MessageIdAction.php index b1bde16a..a6dc3048 100644 --- a/src/LightSaml/Action/Profile/Outbound/Message/MessageIdAction.php +++ b/src/LightSaml/Action/Profile/Outbound/Message/MessageIdAction.php @@ -30,7 +30,7 @@ protected function doExecute(ProfileContext $context) $this->logger->info( sprintf('Message ID set to "%s"', $id), - LogHelper::getActionContext($context, $this, array('message_id' => $id)) + LogHelper::getActionContext($context, $this, ['message_id' => $id]) ); } } diff --git a/src/LightSaml/Action/Profile/Outbound/Message/MessageIssueInstantAction.php b/src/LightSaml/Action/Profile/Outbound/Message/MessageIssueInstantAction.php index 4062bfd2..4492324b 100644 --- a/src/LightSaml/Action/Profile/Outbound/Message/MessageIssueInstantAction.php +++ b/src/LightSaml/Action/Profile/Outbound/Message/MessageIssueInstantAction.php @@ -26,10 +26,6 @@ class MessageIssueInstantAction extends AbstractProfileAction /** @var TimeProviderInterface */ protected $timeProvider; - /** - * @param LoggerInterface $logger - * @param TimeProviderInterface $timeProvider - */ public function __construct(LoggerInterface $logger, TimeProviderInterface $timeProvider) { parent::__construct($logger); @@ -38,8 +34,6 @@ public function __construct(LoggerInterface $logger, TimeProviderInterface $time } /** - * @param ProfileContext $context - * * @return void */ protected function doExecute(ProfileContext $context) diff --git a/src/LightSaml/Action/Profile/Outbound/Message/MessageVersionAction.php b/src/LightSaml/Action/Profile/Outbound/Message/MessageVersionAction.php index 43413788..b61495aa 100644 --- a/src/LightSaml/Action/Profile/Outbound/Message/MessageVersionAction.php +++ b/src/LightSaml/Action/Profile/Outbound/Message/MessageVersionAction.php @@ -26,8 +26,7 @@ class MessageVersionAction extends AbstractProfileAction private $version; /** - * @param LoggerInterface $logger - * @param string $version + * @param string $version */ public function __construct(LoggerInterface $logger, $version) { @@ -37,8 +36,6 @@ public function __construct(LoggerInterface $logger, $version) } /** - * @param ProfileContext $context - * * @return void */ protected function doExecute(ProfileContext $context) diff --git a/src/LightSaml/Action/Profile/Outbound/Message/ResolveEndpointBaseAction.php b/src/LightSaml/Action/Profile/Outbound/Message/ResolveEndpointBaseAction.php index 12262377..7824a3c3 100644 --- a/src/LightSaml/Action/Profile/Outbound/Message/ResolveEndpointBaseAction.php +++ b/src/LightSaml/Action/Profile/Outbound/Message/ResolveEndpointBaseAction.php @@ -14,6 +14,7 @@ use LightSaml\Action\Profile\AbstractProfileAction; use LightSaml\Context\Profile\Helper\LogHelper; use LightSaml\Context\Profile\ProfileContext; +use LightSaml\Criteria\CriteriaSet; use LightSaml\Error\LightSamlContextException; use LightSaml\Model\Metadata\EndpointReference; use LightSaml\Model\Metadata\IdpSsoDescriptor; @@ -25,7 +26,6 @@ use LightSaml\Resolver\Endpoint\Criteria\LocationCriteria; use LightSaml\Resolver\Endpoint\Criteria\ServiceTypeCriteria; use LightSaml\Resolver\Endpoint\EndpointResolverInterface; -use LightSaml\Criteria\CriteriaSet; use LightSaml\SamlConstants; use Psr\Log\LoggerInterface; @@ -37,10 +37,6 @@ abstract class ResolveEndpointBaseAction extends AbstractProfileAction /** @var EndpointResolverInterface */ protected $endpointResolver; - /** - * @param LoggerInterface $logger - * @param EndpointResolverInterface $endpointResolver - */ public function __construct(LoggerInterface $logger, EndpointResolverInterface $endpointResolver) { parent::__construct($logger); @@ -48,9 +44,6 @@ public function __construct(LoggerInterface $logger, EndpointResolverInterface $ $this->endpointResolver = $endpointResolver; } - /** - * @param ProfileContext $context - */ protected function doExecute(ProfileContext $context) { if ($context->getEndpointContext()->getEndpoint()) { @@ -60,10 +53,10 @@ protected function doExecute(ProfileContext $context) $context->getEndpoint()->getLocation(), $context->getEndpoint()->getBinding() ), - LogHelper::getActionContext($context, $this, array( + LogHelper::getActionContext($context, $this, [ 'endpointLocation' => $context->getEndpoint()->getLocation(), 'endpointBinding' => $context->getEndpoint()->getBinding(), - )) + ]) ); return; @@ -100,18 +93,16 @@ protected function doExecute(ProfileContext $context) $endpointReference->getEndpoint()->getLocation(), $endpointReference->getEndpoint()->getBinding() ), - LogHelper::getActionContext($context, $this, array( + LogHelper::getActionContext($context, $this, [ 'endpointLocation' => $endpointReference->getEndpoint()->getLocation(), 'endpointBinding' => $endpointReference->getEndpoint()->getBinding(), - )) + ]) ); $context->getEndpointContext()->setEndpoint($endpointReference->getEndpoint()); } /** - * @param ProfileContext $context - * * @return CriteriaSet */ protected function getCriteriaSet(ProfileContext $context) @@ -137,21 +128,17 @@ protected function getCriteriaSet(ProfileContext $context) } /** - * @param ProfileContext $context - * * @return string[] */ protected function getBindings(ProfileContext $context) { - return array( + return [ SamlConstants::BINDING_SAML2_HTTP_POST, SamlConstants::BINDING_SAML2_HTTP_REDIRECT, - ); + ]; } /** - * @param ProfileContext $context - * * @return string|null */ protected function getDescriptorType(ProfileContext $context) @@ -162,8 +149,6 @@ protected function getDescriptorType(ProfileContext $context) } /** - * @param ProfileContext $context - * * @return string|null */ protected function getServiceType(ProfileContext $context) diff --git a/src/LightSaml/Action/Profile/Outbound/Message/SaveRequestStateAction.php b/src/LightSaml/Action/Profile/Outbound/Message/SaveRequestStateAction.php index ebf67478..10adf926 100644 --- a/src/LightSaml/Action/Profile/Outbound/Message/SaveRequestStateAction.php +++ b/src/LightSaml/Action/Profile/Outbound/Message/SaveRequestStateAction.php @@ -25,10 +25,6 @@ class SaveRequestStateAction extends AbstractProfileAction /** @var RequestStateStoreInterface */ protected $requestStore; - /** - * @param LoggerInterface $logger - * @param RequestStateStoreInterface $requestStore - */ public function __construct(LoggerInterface $logger, RequestStateStoreInterface $requestStore) { parent::__construct($logger); @@ -36,9 +32,6 @@ public function __construct(LoggerInterface $logger, RequestStateStoreInterface $this->requestStore = $requestStore; } - /** - * @param ProfileContext $context - */ protected function doExecute(ProfileContext $context) { $message = MessageContextHelper::asSamlMessage($context->getOutboundContext()); diff --git a/src/LightSaml/Action/Profile/Outbound/Message/SendMessageAction.php b/src/LightSaml/Action/Profile/Outbound/Message/SendMessageAction.php index b424ca1f..137cd345 100644 --- a/src/LightSaml/Action/Profile/Outbound/Message/SendMessageAction.php +++ b/src/LightSaml/Action/Profile/Outbound/Message/SendMessageAction.php @@ -22,10 +22,6 @@ class SendMessageAction extends AbstractProfileAction /** @var BindingFactoryInterface */ protected $bindingFactory; - /** - * @param LoggerInterface $logger - * @param BindingFactoryInterface $bindingFactory - */ public function __construct(LoggerInterface $logger, BindingFactoryInterface $bindingFactory) { parent::__construct($logger); @@ -34,8 +30,6 @@ public function __construct(LoggerInterface $logger, BindingFactoryInterface $bi } /** - * @param ProfileContext $context - * * @return void */ public function doExecute(ProfileContext $context) @@ -50,9 +44,9 @@ public function doExecute(ProfileContext $context) $this->logger->info( 'Sending message', - LogHelper::getActionContext($context, $this, array( + LogHelper::getActionContext($context, $this, [ 'message' => $outboundContext->getSerializationContext()->getDocument()->saveXML(), - )) + ]) ); } } diff --git a/src/LightSaml/Action/Profile/Outbound/Message/SignMessageAction.php b/src/LightSaml/Action/Profile/Outbound/Message/SignMessageAction.php index e4a762dc..7cc6481f 100644 --- a/src/LightSaml/Action/Profile/Outbound/Message/SignMessageAction.php +++ b/src/LightSaml/Action/Profile/Outbound/Message/SignMessageAction.php @@ -29,10 +29,6 @@ class SignMessageAction extends AbstractProfileAction /** @var SignatureResolverInterface */ protected $signatureResolver; - /** - * @param LoggerInterface $logger - * @param SignatureResolverInterface $signatureResolver - */ public function __construct(LoggerInterface $logger, SignatureResolverInterface $signatureResolver) { parent::__construct($logger); @@ -52,14 +48,14 @@ protected function doExecute(ProfileContext $context) $this->logger->debug( sprintf('Message signed with fingerprint "%s"', $signature->getCertificate()->getFingerprint()), - LogHelper::getActionContext($context, $this, array( + LogHelper::getActionContext($context, $this, [ 'certificate' => $signature->getCertificate()->getInfo(), - )) + ]) ); } else { $this->logger->critical( 'No signature resolved, although signing enabled', - LogHelper::getActionErrorContext($context, $this, array()) + LogHelper::getActionErrorContext($context, $this, []) ); } } else { @@ -68,8 +64,6 @@ protected function doExecute(ProfileContext $context) } /** - * @param ProfileContext $context - * * @return bool */ private function shouldSignMessage(ProfileContext $context) diff --git a/src/LightSaml/Action/WrappedAction.php b/src/LightSaml/Action/WrappedAction.php index 489c2237..110fc67b 100644 --- a/src/LightSaml/Action/WrappedAction.php +++ b/src/LightSaml/Action/WrappedAction.php @@ -20,17 +20,12 @@ abstract class WrappedAction implements ActionInterface */ protected $action; - /** - * @param ActionInterface $action - */ public function __construct(ActionInterface $action) { $this->action = $action; } /** - * @param ContextInterface $context - * * @return void */ public function execute(ContextInterface $context) @@ -40,13 +35,7 @@ public function execute(ContextInterface $context) $this->afterAction($context); } - /** - * @param ContextInterface $context - */ abstract protected function beforeAction(ContextInterface $context); - /** - * @param ContextInterface $context - */ abstract protected function afterAction(ContextInterface $context); } diff --git a/src/LightSaml/Binding/AbstractBinding.php b/src/LightSaml/Binding/AbstractBinding.php index 53517292..f39b097f 100644 --- a/src/LightSaml/Binding/AbstractBinding.php +++ b/src/LightSaml/Binding/AbstractBinding.php @@ -23,8 +23,6 @@ abstract class AbstractBinding protected $eventDispatcher; /** - * @param EventDispatcherInterface|null $eventDispatcher - * * @return AbstractBinding */ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher = null) @@ -35,7 +33,7 @@ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher = n } /** - * @return null|\Symfony\Component\EventDispatcher\EventDispatcherInterface + * @return \Symfony\Component\EventDispatcher\EventDispatcherInterface|null */ public function getEventDispatcher() { @@ -63,16 +61,11 @@ protected function dispatchSend($messageString) } /** - * @param MessageContext $context - * @param null|string $destination + * @param string|null $destination * * @return \Symfony\Component\HttpFoundation\Response */ abstract public function send(MessageContext $context, $destination = null); - /** - * @param Request $request - * @param MessageContext $context - */ abstract public function receive(Request $request, MessageContext $context); } diff --git a/src/LightSaml/Binding/BindingFactory.php b/src/LightSaml/Binding/BindingFactory.php index 02e0c306..978f46c3 100644 --- a/src/LightSaml/Binding/BindingFactory.php +++ b/src/LightSaml/Binding/BindingFactory.php @@ -30,8 +30,6 @@ public function __construct(EventDispatcherInterface $eventDispatcher = null) } /** - * @param null|EventDispatcherInterface $eventDispatcher - * * @return BindingFactoryInterface */ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher = null) @@ -42,8 +40,6 @@ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher = n } /** - * @param Request $request - * * @return AbstractBinding */ public function getBindingByRequest(Request $request) @@ -89,8 +85,6 @@ public function create($bindingType) } /** - * @param Request $request - * * @return string|null */ public function detectBindingType(Request $request) @@ -106,9 +100,7 @@ public function detectBindingType(Request $request) } /** - * @param Request $request - * - * @return null|string + * @return string|null */ protected function processGET(Request $request) { @@ -123,9 +115,7 @@ protected function processGET(Request $request) } /** - * @param Request $request - * - * @return null|string + * @return string|null */ protected function processPOST(Request $request) { diff --git a/src/LightSaml/Binding/BindingFactoryInterface.php b/src/LightSaml/Binding/BindingFactoryInterface.php index daddab19..f4f659cb 100644 --- a/src/LightSaml/Binding/BindingFactoryInterface.php +++ b/src/LightSaml/Binding/BindingFactoryInterface.php @@ -16,8 +16,6 @@ interface BindingFactoryInterface { /** - * @param Request $request - * * @return AbstractBinding */ public function getBindingByRequest(Request $request); @@ -32,8 +30,6 @@ public function getBindingByRequest(Request $request); public function create($bindingType); /** - * @param Request $request - * * @return string|null */ public function detectBindingType(Request $request); diff --git a/src/LightSaml/Binding/HttpPostBinding.php b/src/LightSaml/Binding/HttpPostBinding.php index 03db6e4f..a1d6d16b 100644 --- a/src/LightSaml/Binding/HttpPostBinding.php +++ b/src/LightSaml/Binding/HttpPostBinding.php @@ -21,8 +21,7 @@ class HttpPostBinding extends AbstractBinding { /** - * @param MessageContext $context - * @param null|string $destination + * @param string|null $destination * * @return SamlPostResponse */ @@ -41,7 +40,7 @@ public function send(MessageContext $context, $destination = null) $type = $message instanceof AbstractRequest ? 'SAMLRequest' : 'SAMLResponse'; - $data = array($type => $msgStr); + $data = [$type => $msgStr]; if ($message->getRelayState()) { $data['RelayState'] = $message->getRelayState(); } @@ -52,10 +51,6 @@ public function send(MessageContext $context, $destination = null) return $result; } - /** - * @param Request $request - * @param MessageContext $context - */ public function receive(Request $request, MessageContext $context) { $post = $request->request->all(); diff --git a/src/LightSaml/Binding/HttpRedirectBinding.php b/src/LightSaml/Binding/HttpRedirectBinding.php index a6bc888b..ba865ef8 100644 --- a/src/LightSaml/Binding/HttpRedirectBinding.php +++ b/src/LightSaml/Binding/HttpRedirectBinding.php @@ -16,8 +16,8 @@ use LightSaml\Error\LightSamlBindingException; use LightSaml\Model\Protocol\AbstractRequest; use LightSaml\Model\Protocol\SamlMessage; -use LightSaml\Model\XmlDSig\SignatureWriter; use LightSaml\Model\XmlDSig\SignatureStringReader; +use LightSaml\Model\XmlDSig\SignatureWriter; use LightSaml\SamlConstants; use RobRichards\XMLSecLibs\XMLSecurityKey; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -26,8 +26,7 @@ class HttpRedirectBinding extends AbstractBinding { /** - * @param MessageContext $context - * @param null|string $destination + * @param string|null $destination * * @return \Symfony\Component\HttpFoundation\Response */ @@ -40,10 +39,6 @@ public function send(MessageContext $context, $destination = null) return new RedirectResponse($url); } - /** - * @param Request $request - * @param MessageContext $context - */ public function receive(Request $request, MessageContext $context) { $data = $this->parseQuery($request); @@ -52,9 +47,6 @@ public function receive(Request $request, MessageContext $context) } /** - * @param array $data - * @param MessageContext $context - * * @throws \Exception */ protected function processData(array $data, MessageContext $context) @@ -75,8 +67,6 @@ protected function processData(array $data, MessageContext $context) } /** - * @param array $data - * * @return string * * @throws LightSamlBindingException @@ -93,8 +83,6 @@ protected function getMessageStringFromData(array $data) } /** - * @param array $data - * * @return string */ protected function getEncodingFromData(array $data) @@ -146,8 +134,7 @@ protected function loadSignature(SamlMessage $message, array $data) } /** - * @param MessageContext $context - * @param string|null $destination + * @param string|null $destination * * @return string */ @@ -168,9 +155,6 @@ protected function getRedirectURL(MessageContext $context, $destination) } /** - * @param SamlMessage $message - * @param MessageContext $context - * * @return string */ protected function getMessageEncodedXml(SamlMessage $message, MessageContext $context) @@ -190,8 +174,7 @@ protected function getMessageEncodedXml(SamlMessage $message, MessageContext $co } /** - * @param SamlMessage $message - * @param string $xml + * @param string $xml * * @return string */ @@ -208,8 +191,7 @@ protected function addMessageToUrl(SamlMessage $message, $xml) } /** - * @param string $msg - * @param SamlMessage $message + * @param string $msg */ protected function addRelayStateToUrl(&$msg, SamlMessage $message) { @@ -219,8 +201,7 @@ protected function addRelayStateToUrl(&$msg, SamlMessage $message) } /** - * @param string $msg - * @param SignatureWriter|null $signature + * @param string $msg */ protected function addSignatureToUrl(&$msg, SignatureWriter $signature = null) { @@ -236,7 +217,6 @@ protected function addSignatureToUrl(&$msg, SignatureWriter $signature = null) /** * @param string $msg - * @param SamlMessage $message * @param string|null $destination * * @return string @@ -254,8 +234,6 @@ protected function getDestinationUrl($msg, SamlMessage $message, $destination) } /** - * @param Request $request - * * @return array */ protected function parseQuery(Request $request) @@ -267,7 +245,7 @@ protected function parseQuery(Request $request) */ $sigQuery = $relayState = $sigAlg = ''; $data = $this->parseQueryString($request->server->get('QUERY_STRING'), false); - $result = array(); + $result = []; foreach ($data as $name => $value) { $result[$name] = urldecode($value); switch ($name) { @@ -296,7 +274,7 @@ protected function parseQuery(Request $request) */ protected function parseQueryString($queryString, $urlDecodeValues = false) { - $result = array(); + $result = []; foreach (explode('&', $queryString) as $e) { $tmp = explode('=', $e, 2); $name = $tmp[0]; diff --git a/src/LightSaml/Binding/SamlPostResponse.php b/src/LightSaml/Binding/SamlPostResponse.php index 357f1f22..beb19aa8 100644 --- a/src/LightSaml/Binding/SamlPostResponse.php +++ b/src/LightSaml/Binding/SamlPostResponse.php @@ -23,11 +23,10 @@ class SamlPostResponse extends Response /** * @param string $destination - * @param array $data * @param int $status * @param array $headers */ - public function __construct($destination, array $data, $status = 200, $headers = array()) + public function __construct($destination, array $data, $status = 200, $headers = []) { parent::__construct('', $status, $headers); diff --git a/src/LightSaml/Bridge/Pimple/Container/AbstractPimpleContainer.php b/src/LightSaml/Bridge/Pimple/Container/AbstractPimpleContainer.php index fceb1688..62fae26e 100644 --- a/src/LightSaml/Bridge/Pimple/Container/AbstractPimpleContainer.php +++ b/src/LightSaml/Bridge/Pimple/Container/AbstractPimpleContainer.php @@ -18,9 +18,6 @@ abstract class AbstractPimpleContainer /** @var Container */ protected $pimple; - /** - * @param Container $pimple - */ public function __construct(Container $pimple) { $this->pimple = $pimple; diff --git a/src/LightSaml/Bridge/Pimple/Container/Factory/CredentialContainerProvider.php b/src/LightSaml/Bridge/Pimple/Container/Factory/CredentialContainerProvider.php index 3c682eac..c5ee3901 100644 --- a/src/LightSaml/Bridge/Pimple/Container/Factory/CredentialContainerProvider.php +++ b/src/LightSaml/Bridge/Pimple/Container/Factory/CredentialContainerProvider.php @@ -29,12 +29,8 @@ class CredentialContainerProvider implements ServiceProviderInterface private $ownContainer; /** @var CredentialInterface[] */ - private $extraCredentials = array(); + private $extraCredentials = []; - /** - * @param PartyContainerInterface $partyContainer - * @param OwnContainerInterface $ownContainer - */ public function __construct(PartyContainerInterface $partyContainer, OwnContainerInterface $ownContainer) { $this->ownContainer = $ownContainer; @@ -42,8 +38,6 @@ public function __construct(PartyContainerInterface $partyContainer, OwnContaine } /** - * @param CredentialInterface $credential - * * @return CredentialContainerProvider */ public function addExtraCredential(CredentialInterface $credential) diff --git a/src/LightSaml/Bridge/Pimple/Container/Factory/OwnContainerProvider.php b/src/LightSaml/Bridge/Pimple/Container/Factory/OwnContainerProvider.php index dd8fa95f..5180ae16 100644 --- a/src/LightSaml/Bridge/Pimple/Container/Factory/OwnContainerProvider.php +++ b/src/LightSaml/Bridge/Pimple/Container/Factory/OwnContainerProvider.php @@ -21,14 +21,13 @@ class OwnContainerProvider implements ServiceProviderInterface { /** @var CredentialInterface[] */ - private $ownCredentials = array(); + private $ownCredentials = []; /** @var EntityDescriptorProviderInterface */ private $ownEntityDescriptorProvider; /** - * @param EntityDescriptorProviderInterface $ownEntityDescriptorProvider - * @param CredentialInterface[] $ownCredentials + * @param CredentialInterface[] $ownCredentials */ public function __construct(EntityDescriptorProviderInterface $ownEntityDescriptorProvider, array $ownCredentials = null) { @@ -41,8 +40,6 @@ public function __construct(EntityDescriptorProviderInterface $ownEntityDescript } /** - * @param CredentialInterface $credential - * * @return OwnContainerProvider */ public function addOwnCredential(CredentialInterface $credential) diff --git a/src/LightSaml/Bridge/Pimple/Container/Factory/ServiceContainerProvider.php b/src/LightSaml/Bridge/Pimple/Container/Factory/ServiceContainerProvider.php index 15581697..5ec77af7 100644 --- a/src/LightSaml/Bridge/Pimple/Container/Factory/ServiceContainerProvider.php +++ b/src/LightSaml/Bridge/Pimple/Container/Factory/ServiceContainerProvider.php @@ -46,11 +46,6 @@ class ServiceContainerProvider implements ServiceProviderInterface /** @var StoreContainerInterface */ private $storeContainer; - /** - * @param CredentialContainerInterface $credentialContainer - * @param StoreContainerInterface $storeContainer - * @param SystemContainerInterface $systemContainer - */ public function __construct( CredentialContainerInterface $credentialContainer, StoreContainerInterface $storeContainer, @@ -85,13 +80,13 @@ public function register(Container $pimple) }; $pimple[ServiceContainer::ENDPOINT_RESOLVER] = function () { - return new CompositeEndpointResolver(array( + return new CompositeEndpointResolver([ new BindingEndpointResolver(), new DescriptorTypeEndpointResolver(), new ServiceTypeEndpointResolver(), new IndexEndpointResolver(), new LocationEndpointResolver(), - )); + ]); }; $pimple[ServiceContainer::BINDING_FACTORY] = function () { diff --git a/src/LightSaml/Bridge/Pimple/Container/OwnContainer.php b/src/LightSaml/Bridge/Pimple/Container/OwnContainer.php index d554ee94..6acd84bf 100644 --- a/src/LightSaml/Bridge/Pimple/Container/OwnContainer.php +++ b/src/LightSaml/Bridge/Pimple/Container/OwnContainer.php @@ -12,8 +12,8 @@ namespace LightSaml\Bridge\Pimple\Container; use LightSaml\Build\Container\OwnContainerInterface; -use LightSaml\Provider\EntityDescriptor\EntityDescriptorProviderInterface; use LightSaml\Credential\CredentialInterface; +use LightSaml\Provider\EntityDescriptor\EntityDescriptorProviderInterface; class OwnContainer extends AbstractPimpleContainer implements OwnContainerInterface { diff --git a/src/LightSaml/Bridge/Pimple/Container/ServiceContainer.php b/src/LightSaml/Bridge/Pimple/Container/ServiceContainer.php index 15b6c641..3e6b19fb 100644 --- a/src/LightSaml/Bridge/Pimple/Container/ServiceContainer.php +++ b/src/LightSaml/Bridge/Pimple/Container/ServiceContainer.php @@ -13,9 +13,9 @@ use LightSaml\Binding\BindingFactoryInterface; use LightSaml\Build\Container\ServiceContainerInterface; +use LightSaml\Logout\Resolver\Logout\LogoutSessionResolverInterface; use LightSaml\Resolver\Credential\CredentialResolverInterface; use LightSaml\Resolver\Endpoint\EndpointResolverInterface; -use LightSaml\Logout\Resolver\Logout\LogoutSessionResolverInterface; use LightSaml\Resolver\Session\SessionProcessorInterface; use LightSaml\Resolver\Signature\SignatureResolverInterface; use LightSaml\Validator\Model\Assertion\AssertionTimeValidator; diff --git a/src/LightSaml/Build/Container/OwnContainerInterface.php b/src/LightSaml/Build/Container/OwnContainerInterface.php index 021eaa66..59a5e3a7 100644 --- a/src/LightSaml/Build/Container/OwnContainerInterface.php +++ b/src/LightSaml/Build/Container/OwnContainerInterface.php @@ -11,8 +11,8 @@ namespace LightSaml\Build\Container; -use LightSaml\Provider\EntityDescriptor\EntityDescriptorProviderInterface; use LightSaml\Credential\CredentialInterface; +use LightSaml\Provider\EntityDescriptor\EntityDescriptorProviderInterface; interface OwnContainerInterface { diff --git a/src/LightSaml/Build/Container/ServiceContainerInterface.php b/src/LightSaml/Build/Container/ServiceContainerInterface.php index 6f220fad..027e6745 100644 --- a/src/LightSaml/Build/Container/ServiceContainerInterface.php +++ b/src/LightSaml/Build/Container/ServiceContainerInterface.php @@ -12,9 +12,9 @@ namespace LightSaml\Build\Container; use LightSaml\Binding\BindingFactoryInterface; +use LightSaml\Logout\Resolver\Logout\LogoutSessionResolverInterface; use LightSaml\Resolver\Credential\CredentialResolverInterface; use LightSaml\Resolver\Endpoint\EndpointResolverInterface; -use LightSaml\Logout\Resolver\Logout\LogoutSessionResolverInterface; use LightSaml\Resolver\Session\SessionProcessorInterface; use LightSaml\Resolver\Signature\SignatureResolverInterface; use LightSaml\Validator\Model\Assertion\AssertionTimeValidator; diff --git a/src/LightSaml/Builder/Action/CompositeActionBuilder.php b/src/LightSaml/Builder/Action/CompositeActionBuilder.php index ab8910fd..79219d5e 100644 --- a/src/LightSaml/Builder/Action/CompositeActionBuilder.php +++ b/src/LightSaml/Builder/Action/CompositeActionBuilder.php @@ -21,7 +21,7 @@ class CompositeActionBuilder implements ActionBuilderInterface * * @var array */ - private $actions = array(); + private $actions = []; /** @var int */ protected $increaseStep = 5; @@ -30,8 +30,7 @@ class CompositeActionBuilder implements ActionBuilderInterface private $biggestPriority = 0; /** - * @param ActionInterface $action - * @param int|bool $priority + * @param int|bool $priority * * @return CompositeActionBuilder */ @@ -47,7 +46,7 @@ public function add(ActionInterface $action, $priority = false) } if (false === isset($this->actions[$priority])) { - $this->actions[$priority] = array(); + $this->actions[$priority] = []; } $this->actions[$priority][] = $action; diff --git a/src/LightSaml/Builder/Action/Profile/AbstractProfileActionBuilder.php b/src/LightSaml/Builder/Action/Profile/AbstractProfileActionBuilder.php index 6171d181..ddfeb0eb 100644 --- a/src/LightSaml/Builder/Action/Profile/AbstractProfileActionBuilder.php +++ b/src/LightSaml/Builder/Action/Profile/AbstractProfileActionBuilder.php @@ -23,9 +23,6 @@ abstract class AbstractProfileActionBuilder extends CompositeActionBuilder /** @var bool */ private $initialized = false; - /** - * @param BuildContainerInterface $buildContainer - */ public function __construct(BuildContainerInterface $buildContainer) { $this->buildContainer = $buildContainer; diff --git a/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpReceiveResponseActionBuilder.php b/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpReceiveResponseActionBuilder.php index 3675d502..723eaa19 100644 --- a/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpReceiveResponseActionBuilder.php +++ b/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpReceiveResponseActionBuilder.php @@ -15,15 +15,15 @@ use LightSaml\Action\Profile\Inbound\Message\AssertBindingTypeAction; use LightSaml\Action\Profile\Inbound\Message\DestinationValidatorResponseAction; use LightSaml\Action\Profile\Inbound\Message\EntityIdFromMessageIssuerAction; -use LightSaml\Action\Profile\Inbound\Message\ResolvePartyEntityIdAction; -use LightSaml\Action\Profile\Inbound\Message\ReceiveMessageAction; +use LightSaml\Action\Profile\Inbound\Message\IssuerValidatorAction; use LightSaml\Action\Profile\Inbound\Message\MessageSignatureValidatorAction; +use LightSaml\Action\Profile\Inbound\Message\ReceiveMessageAction; +use LightSaml\Action\Profile\Inbound\Message\ResolvePartyEntityIdAction; use LightSaml\Action\Profile\Inbound\Response\AssertionAction; use LightSaml\Action\Profile\Inbound\Response\DecryptAssertionsAction; use LightSaml\Action\Profile\Inbound\Response\HasAssertionsValidatorAction; use LightSaml\Action\Profile\Inbound\Response\HasAuthnStatementValidatorAction; use LightSaml\Action\Profile\Inbound\Response\HasBearerAssertionsValidatorAction; -use LightSaml\Action\Profile\Inbound\Message\IssuerValidatorAction; use LightSaml\Action\Profile\Inbound\Response\SpSsoStateAction; use LightSaml\Action\Profile\Inbound\StatusResponse\InResponseToValidatorAction; use LightSaml\Action\Profile\Inbound\StatusResponse\StatusAction; @@ -37,10 +37,6 @@ class SsoSpReceiveResponseActionBuilder extends AbstractProfileActionBuilder /** @var ActionBuilderInterface */ private $assertionActionBuilder; - /** - * @param BuildContainerInterface $buildContainer - * @param ActionBuilderInterface $assertionActionBuilder - */ public function __construct(BuildContainerInterface $buildContainer, ActionBuilderInterface $assertionActionBuilder) { parent::__construct($buildContainer); @@ -60,7 +56,7 @@ protected function doInitialize() ), 100); $this->add(new AssertBindingTypeAction( $this->buildContainer->getSystemContainer()->getLogger(), - array(SamlConstants::BINDING_SAML2_HTTP_POST) + [SamlConstants::BINDING_SAML2_HTTP_POST] )); // Response validation diff --git a/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpSendAuthnRequestActionBuilder.php b/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpSendAuthnRequestActionBuilder.php index d2ed20f9..8311d0dd 100644 --- a/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpSendAuthnRequestActionBuilder.php +++ b/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpSendAuthnRequestActionBuilder.php @@ -17,12 +17,12 @@ use LightSaml\Action\Profile\Outbound\Message\DestinationAction; use LightSaml\Action\Profile\Outbound\Message\MessageIdAction; use LightSaml\Action\Profile\Outbound\Message\MessageIssueInstantAction; +use LightSaml\Action\Profile\Outbound\Message\MessageVersionAction; use LightSaml\Action\Profile\Outbound\Message\ResolveEndpointIdpSsoAction; use LightSaml\Action\Profile\Outbound\Message\SaveRequestStateAction; use LightSaml\Action\Profile\Outbound\Message\SendMessageAction; use LightSaml\Action\Profile\Outbound\Message\SetRelayStateAction; use LightSaml\Action\Profile\Outbound\Message\SignMessageAction; -use LightSaml\Action\Profile\Outbound\Message\MessageVersionAction; use LightSaml\Builder\Action\Profile\AbstractProfileActionBuilder; use LightSaml\Event\Events; use LightSaml\SamlConstants; diff --git a/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpValidateAssertionActionBuilder.php b/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpValidateAssertionActionBuilder.php index 7d6f7f5f..b22d68b0 100644 --- a/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpValidateAssertionActionBuilder.php +++ b/src/LightSaml/Builder/Action/Profile/SingleSignOn/Sp/SsoSpValidateAssertionActionBuilder.php @@ -11,9 +11,9 @@ namespace LightSaml\Builder\Action\Profile\SingleSignOn\Sp; +use LightSaml\Action\Assertion\Inbound\AssertionIssuerFormatValidatorAction; use LightSaml\Action\Assertion\Inbound\AssertionSignatureValidatorAction; use LightSaml\Action\Assertion\Inbound\AssertionValidatorAction; -use LightSaml\Action\Assertion\Inbound\AssertionIssuerFormatValidatorAction; use LightSaml\Action\Assertion\Inbound\InResponseToValidatorAction; use LightSaml\Action\Assertion\Inbound\KnownAssertionIssuerAction; use LightSaml\Action\Assertion\Inbound\RecipientValidatorAction; diff --git a/src/LightSaml/Builder/Context/ProfileContextBuilder.php b/src/LightSaml/Builder/Context/ProfileContextBuilder.php index d563289d..cbe335c7 100644 --- a/src/LightSaml/Builder/Context/ProfileContextBuilder.php +++ b/src/LightSaml/Builder/Context/ProfileContextBuilder.php @@ -39,8 +39,6 @@ public function getRequest() } /** - * @param Request $request - * * @return ProfileContextBuilder */ public function setRequest(Request $request) @@ -59,8 +57,6 @@ public function getOwnEntityDescriptorProvider() } /** - * @param EntityDescriptorProviderInterface $ownEntityDescriptorProvider - * * @return ProfileContextBuilder */ public function setOwnEntityDescriptorProvider(EntityDescriptorProviderInterface $ownEntityDescriptorProvider) diff --git a/src/LightSaml/Builder/EntityDescriptor/SimpleEntityDescriptorBuilder.php b/src/LightSaml/Builder/EntityDescriptor/SimpleEntityDescriptorBuilder.php index d5e5d901..2b2ba6f2 100644 --- a/src/LightSaml/Builder/EntityDescriptor/SimpleEntityDescriptorBuilder.php +++ b/src/LightSaml/Builder/EntityDescriptor/SimpleEntityDescriptorBuilder.php @@ -11,6 +11,7 @@ namespace LightSaml\Builder\EntityDescriptor; +use LightSaml\Credential\X509Certificate; use LightSaml\Model\Metadata\AssertionConsumerService; use LightSaml\Model\Metadata\EntityDescriptor; use LightSaml\Model\Metadata\IdpSsoDescriptor; @@ -20,7 +21,6 @@ use LightSaml\Model\Metadata\SpSsoDescriptor; use LightSaml\Provider\EntityDescriptor\EntityDescriptorProviderInterface; use LightSaml\SamlConstants; -use LightSaml\Credential\X509Certificate; class SimpleEntityDescriptorBuilder implements EntityDescriptorProviderInterface { @@ -49,22 +49,21 @@ class SimpleEntityDescriptorBuilder implements EntityDescriptorProviderInterface private $entityDescriptor; /** - * @param string $entityId - * @param string $acsUrl - * @param string $ssoUrl - * @param X509Certificate $ownCertificate - * @param string[] $acsBindings - * @param string[] $ssoBindings - * @param string[]|null $use + * @param string $entityId + * @param string $acsUrl + * @param string $ssoUrl + * @param string[] $acsBindings + * @param string[] $ssoBindings + * @param string[]|null $use */ public function __construct( $entityId, $acsUrl, $ssoUrl, X509Certificate $ownCertificate, - array $acsBindings = array(SamlConstants::BINDING_SAML2_HTTP_POST), - array $ssoBindings = array(SamlConstants::BINDING_SAML2_HTTP_POST, SamlConstants::BINDING_SAML2_HTTP_REDIRECT), - $use = array(KeyDescriptor::USE_ENCRYPTION, KeyDescriptor::USE_SIGNING) + array $acsBindings = [SamlConstants::BINDING_SAML2_HTTP_POST], + array $ssoBindings = [SamlConstants::BINDING_SAML2_HTTP_POST, SamlConstants::BINDING_SAML2_HTTP_REDIRECT], + $use = [KeyDescriptor::USE_ENCRYPTION, KeyDescriptor::USE_SIGNING] ) { $this->entityId = $entityId; $this->acsUrl = $acsUrl; @@ -157,9 +156,6 @@ protected function getIdpSsoDescriptor() return $idpSso; } - /** - * @param RoleDescriptor $descriptor - */ protected function addKeyDescriptors(RoleDescriptor $descriptor) { if ($this->use) { diff --git a/src/LightSaml/Builder/Profile/AbstractProfileBuilder.php b/src/LightSaml/Builder/Profile/AbstractProfileBuilder.php index 42a3ca18..1d8d771c 100644 --- a/src/LightSaml/Builder/Profile/AbstractProfileBuilder.php +++ b/src/LightSaml/Builder/Profile/AbstractProfileBuilder.php @@ -19,9 +19,6 @@ abstract class AbstractProfileBuilder implements ProfileBuilderInterface /** @var BuildContainerInterface */ protected $container; - /** - * @param BuildContainerInterface $buildContainer - */ public function __construct(BuildContainerInterface $buildContainer) { $this->container = $buildContainer; diff --git a/src/LightSaml/Builder/Profile/WebBrowserSso/Sp/SsoSpSendAuthnRequestProfileBuilder.php b/src/LightSaml/Builder/Profile/WebBrowserSso/Sp/SsoSpSendAuthnRequestProfileBuilder.php index 79228b4e..9a812137 100644 --- a/src/LightSaml/Builder/Profile/WebBrowserSso/Sp/SsoSpSendAuthnRequestProfileBuilder.php +++ b/src/LightSaml/Builder/Profile/WebBrowserSso/Sp/SsoSpSendAuthnRequestProfileBuilder.php @@ -24,8 +24,7 @@ class SsoSpSendAuthnRequestProfileBuilder extends AbstractProfileBuilder protected $idpEntityId; /** - * @param BuildContainerInterface $buildContainer - * @param string $idpEntityId + * @param string $idpEntityId */ public function __construct(BuildContainerInterface $buildContainer, $idpEntityId) { @@ -78,8 +77,6 @@ protected function getActionBuilder() } /** - * @param EntityDescriptor $idpEd - * * @return TrustOptions */ private function getTrustOptions(EntityDescriptor $idpEd) diff --git a/src/LightSaml/Builder/Profile/WebBrowserSso/Sp/SsoSpSendAuthnRequestProfileBuilderFactory.php b/src/LightSaml/Builder/Profile/WebBrowserSso/Sp/SsoSpSendAuthnRequestProfileBuilderFactory.php index 93f46ef8..45f5d858 100644 --- a/src/LightSaml/Builder/Profile/WebBrowserSso/Sp/SsoSpSendAuthnRequestProfileBuilderFactory.php +++ b/src/LightSaml/Builder/Profile/WebBrowserSso/Sp/SsoSpSendAuthnRequestProfileBuilderFactory.php @@ -18,9 +18,6 @@ class SsoSpSendAuthnRequestProfileBuilderFactory /** @var BuildContainerInterface */ private $buildContainer; - /** - * @param BuildContainerInterface $buildContainer - */ public function __construct(BuildContainerInterface $buildContainer) { $this->buildContainer = $buildContainer; diff --git a/src/LightSaml/Context/AbstractContext.php b/src/LightSaml/Context/AbstractContext.php index 5138cb01..818625fd 100644 --- a/src/LightSaml/Context/AbstractContext.php +++ b/src/LightSaml/Context/AbstractContext.php @@ -17,7 +17,7 @@ abstract class AbstractContext implements ContextInterface private $parent; /** @var ContextInterface[] */ - private $subContexts = array(); + private $subContexts = []; /** * @return ContextInterface|null @@ -40,8 +40,6 @@ public function getTopParent() } /** - * @param ContextInterface|null $parent - * * @return ContextInterface */ public function setParent(ContextInterface $parent = null) @@ -53,7 +51,7 @@ public function setParent(ContextInterface $parent = null) /** * @param string $name - * @param null|string $class + * @param string|null $class * * @return ContextInterface|null */ @@ -148,7 +146,7 @@ public function clearSubContexts() foreach ($this->subContexts as $subContext) { $subContext->setParent(null); } - $this->subContexts = array(); + $this->subContexts = []; return $this; } @@ -168,17 +166,17 @@ public function getIterator() */ public function debugPrintTree($ownName = 'root') { - $result = array( + $result = [ $ownName => static::class, - ); + ]; if ($this->subContexts) { - $arr = array(); + $arr = []; foreach ($this->subContexts as $name => $subContext) { if ($subContext instanceof ContextInterface) { $arr = array_merge($arr, $subContext->debugPrintTree($name)); } else { - $arr = array_merge($arr, array($name => get_class($subContext))); + $arr = array_merge($arr, [$name => get_class($subContext)]); } } $result[$ownName.'__children'] = $arr; diff --git a/src/LightSaml/Context/ContextInterface.php b/src/LightSaml/Context/ContextInterface.php index 89c6541e..626e5730 100644 --- a/src/LightSaml/Context/ContextInterface.php +++ b/src/LightSaml/Context/ContextInterface.php @@ -24,15 +24,13 @@ public function getParent(); public function getTopParent(); /** - * @param ContextInterface|null $parent - * * @return ContextInterface */ public function setParent(ContextInterface $parent = null); /** * @param string $name - * @param null|string $class + * @param string|null $class * * @return ContextInterface|null */ diff --git a/src/LightSaml/Context/Profile/EndpointContext.php b/src/LightSaml/Context/Profile/EndpointContext.php index d1e18f4b..07ce5589 100644 --- a/src/LightSaml/Context/Profile/EndpointContext.php +++ b/src/LightSaml/Context/Profile/EndpointContext.php @@ -27,8 +27,6 @@ public function getEndpoint() } /** - * @param Endpoint $endpoint - * * @return EndpointContext */ public function setEndpoint(Endpoint $endpoint) diff --git a/src/LightSaml/Context/Profile/EntityContext.php b/src/LightSaml/Context/Profile/EntityContext.php index 1a7b4668..d508cc18 100644 --- a/src/LightSaml/Context/Profile/EntityContext.php +++ b/src/LightSaml/Context/Profile/EntityContext.php @@ -54,8 +54,6 @@ public function getEntityDescriptor() } /** - * @param EntityDescriptor $entityDescriptor - * * @return EntityContext */ public function setEntityDescriptor(EntityDescriptor $entityDescriptor) @@ -74,8 +72,6 @@ public function getTrustOptions() } /** - * @param TrustOptions $trustOptions - * * @return EntityContext */ public function setTrustOptions(TrustOptions $trustOptions) diff --git a/src/LightSaml/Context/Profile/ExceptionContext.php b/src/LightSaml/Context/Profile/ExceptionContext.php index 9a0f7fc1..e51b75b8 100644 --- a/src/LightSaml/Context/Profile/ExceptionContext.php +++ b/src/LightSaml/Context/Profile/ExceptionContext.php @@ -19,9 +19,6 @@ class ExceptionContext extends AbstractProfileContext /** @var ExceptionContext|null */ protected $nextExceptionContext; - /** - * @param \Exception|null $exception - */ public function __construct(\Exception $exception = null) { $this->exception = $exception; @@ -56,8 +53,6 @@ public function getNextExceptionContext() } /** - * @param \Exception $exception - * * @return ExceptionContext */ public function addException(\Exception $exception) diff --git a/src/LightSaml/Context/Profile/Helper/AssertionContextHelper.php b/src/LightSaml/Context/Profile/Helper/AssertionContextHelper.php index 40136754..8760506d 100644 --- a/src/LightSaml/Context/Profile/Helper/AssertionContextHelper.php +++ b/src/LightSaml/Context/Profile/Helper/AssertionContextHelper.php @@ -18,8 +18,6 @@ abstract class AssertionContextHelper { /** - * @param AssertionContext $context - * * @return EncryptedAssertionReader */ public static function getEncryptedAssertionReader(AssertionContext $context) diff --git a/src/LightSaml/Context/Profile/Helper/LogHelper.php b/src/LightSaml/Context/Profile/Helper/LogHelper.php index 4a1936df..3355c2f2 100644 --- a/src/LightSaml/Context/Profile/Helper/LogHelper.php +++ b/src/LightSaml/Context/Profile/Helper/LogHelper.php @@ -18,9 +18,7 @@ abstract class LogHelper { /** - * @param ContextInterface $context - * @param ActionInterface $action - * @param array $extraData + * @param array $extraData * * @return array */ @@ -30,9 +28,7 @@ public static function getActionContext(ContextInterface $context, ActionInterfa } /** - * @param ContextInterface $context - * @param ActionInterface $action - * @param array $extraData + * @param array $extraData * * @return array */ @@ -42,17 +38,16 @@ public static function getActionErrorContext(ContextInterface $context, ActionIn } /** - * @param ContextInterface $context - * @param ActionInterface $action - * @param array $extraData - * @param bool $logWholeContext + * @param ActionInterface $action + * @param array $extraData + * @param bool $logWholeContext * * @return array */ private static function getContext(ContextInterface $context, ActionInterface $action = null, array $extraData = null, $logWholeContext = false) { $topContext = $context->getTopParent(); - $result = array(); + $result = []; if ($topContext instanceof ProfileContext) { $result['profile_id'] = $topContext->getProfileId(); $result['own_role'] = $topContext->getOwnRole(); diff --git a/src/LightSaml/Context/Profile/Helper/MessageContextHelper.php b/src/LightSaml/Context/Profile/Helper/MessageContextHelper.php index 0c578fba..873cadc9 100644 --- a/src/LightSaml/Context/Profile/Helper/MessageContextHelper.php +++ b/src/LightSaml/Context/Profile/Helper/MessageContextHelper.php @@ -23,8 +23,6 @@ abstract class MessageContextHelper { /** - * @param MessageContext $context - * * @return \LightSaml\Model\Protocol\SamlMessage */ public static function asSamlMessage(MessageContext $context) @@ -38,8 +36,6 @@ public static function asSamlMessage(MessageContext $context) } /** - * @param MessageContext $context - * * @return \LightSaml\Model\Protocol\AuthnRequest */ public static function asAuthnRequest(MessageContext $context) @@ -53,8 +49,6 @@ public static function asAuthnRequest(MessageContext $context) } /** - * @param MessageContext $context - * * @return \LightSaml\Model\Protocol\AbstractRequest */ public static function asAbstractRequest(MessageContext $context) @@ -68,8 +62,6 @@ public static function asAbstractRequest(MessageContext $context) } /** - * @param MessageContext $context - * * @return \LightSaml\Model\Protocol\Response */ public static function asResponse(MessageContext $context) @@ -83,8 +75,6 @@ public static function asResponse(MessageContext $context) } /** - * @param MessageContext $context - * * @return \LightSaml\Model\Protocol\StatusResponse */ public static function asStatusResponse(MessageContext $context) @@ -98,8 +88,6 @@ public static function asStatusResponse(MessageContext $context) } /** - * @param MessageContext $context - * * @return \LightSaml\Model\Protocol\LogoutRequest */ public static function asLogoutRequest(MessageContext $context) @@ -113,8 +101,6 @@ public static function asLogoutRequest(MessageContext $context) } /** - * @param MessageContext $context - * * @return \LightSaml\Model\Protocol\LogoutResponse */ public static function asLogoutResponse(MessageContext $context) diff --git a/src/LightSaml/Context/Profile/HttpRequestContext.php b/src/LightSaml/Context/Profile/HttpRequestContext.php index b25445d1..5c1c0c0a 100644 --- a/src/LightSaml/Context/Profile/HttpRequestContext.php +++ b/src/LightSaml/Context/Profile/HttpRequestContext.php @@ -27,8 +27,6 @@ public function getRequest() } /** - * @param Request $request - * * @return HttpRequestContext */ public function setRequest(Request $request) diff --git a/src/LightSaml/Context/Profile/HttpResponseContext.php b/src/LightSaml/Context/Profile/HttpResponseContext.php index 20ac3c6e..e5ee5bbc 100644 --- a/src/LightSaml/Context/Profile/HttpResponseContext.php +++ b/src/LightSaml/Context/Profile/HttpResponseContext.php @@ -27,8 +27,6 @@ public function getResponse() } /** - * @param Response $response - * * @return HttpResponseContext */ public function setResponse(Response $response) diff --git a/src/LightSaml/Context/Profile/LogoutContext.php b/src/LightSaml/Context/Profile/LogoutContext.php index d3d95be3..2fc86bd6 100644 --- a/src/LightSaml/Context/Profile/LogoutContext.php +++ b/src/LightSaml/Context/Profile/LogoutContext.php @@ -30,8 +30,6 @@ public function getSsoSessionState() } /** - * @param SsoSessionState $ssoSessionState - * * @return LogoutContext */ public function setSsoSessionState(SsoSessionState $ssoSessionState) diff --git a/src/LightSaml/Context/Profile/MessageContext.php b/src/LightSaml/Context/Profile/MessageContext.php index 025c6d2f..fc5a17fc 100644 --- a/src/LightSaml/Context/Profile/MessageContext.php +++ b/src/LightSaml/Context/Profile/MessageContext.php @@ -56,8 +56,6 @@ public function getMessage() } /** - * @param SamlMessage|null $message - * * @return MessageContext */ public function setMessage(SamlMessage $message = null) diff --git a/src/LightSaml/Credential/AbstractCredential.php b/src/LightSaml/Credential/AbstractCredential.php index bfdd8a78..6aefce1c 100644 --- a/src/LightSaml/Credential/AbstractCredential.php +++ b/src/LightSaml/Credential/AbstractCredential.php @@ -23,7 +23,7 @@ abstract class AbstractCredential implements CredentialInterface private $usageType; /** @var string[] */ - private $keyNames = array(); + private $keyNames = []; /** @var XMLSecurityKey|null */ private $publicKey; @@ -101,8 +101,6 @@ public function getCredentialContext() } /** - * @param CredentialContextSet $credentialContext - * * @return AbstractCredential */ public function setCredentialContext(CredentialContextSet $credentialContext) @@ -152,7 +150,7 @@ public function addKeyName($keyName) } /** - * @param null|XMLSecurityKey $privateKey + * @param XMLSecurityKey|null $privateKey * * @return AbstractCredential */ @@ -164,7 +162,7 @@ public function setPrivateKey(XMLSecurityKey $privateKey) } /** - * @param null|XMLSecurityKey $publicKey + * @param XMLSecurityKey|null $publicKey * * @return AbstractCredential */ @@ -176,7 +174,7 @@ public function setPublicKey(XMLSecurityKey $publicKey) } /** - * @param null|string $secretKey + * @param string|null $secretKey * * @return AbstractCredential */ diff --git a/src/LightSaml/Credential/Context/CredentialContextSet.php b/src/LightSaml/Credential/Context/CredentialContextSet.php index bbfce4d6..727384d1 100644 --- a/src/LightSaml/Credential/Context/CredentialContextSet.php +++ b/src/LightSaml/Credential/Context/CredentialContextSet.php @@ -14,12 +14,12 @@ class CredentialContextSet { /** @var CredentialContextInterface[] */ - protected $contexts = array(); + protected $contexts = []; /** * @param CredentialContextInterface[] $contexts */ - public function __construct(array $contexts = array()) + public function __construct(array $contexts = []) { foreach ($contexts as $context) { if (false == $context instanceof CredentialContextInterface) { diff --git a/src/LightSaml/Credential/Context/MetadataCredentialContext.php b/src/LightSaml/Credential/Context/MetadataCredentialContext.php index 3cdb12e5..1ffbca61 100644 --- a/src/LightSaml/Credential/Context/MetadataCredentialContext.php +++ b/src/LightSaml/Credential/Context/MetadataCredentialContext.php @@ -26,11 +26,6 @@ class MetadataCredentialContext implements CredentialContextInterface /** @var EntityDescriptor */ protected $entityDescriptor; - /** - * @param KeyDescriptor $keyDescriptor - * @param RoleDescriptor $roleDescriptor - * @param EntityDescriptor $entityDescriptor - */ public function __construct(KeyDescriptor $keyDescriptor, RoleDescriptor $roleDescriptor, EntityDescriptor $entityDescriptor) { $this->entityDescriptor = $entityDescriptor; diff --git a/src/LightSaml/Credential/KeyHelper.php b/src/LightSaml/Credential/KeyHelper.php index 2941fd5b..9b480060 100644 --- a/src/LightSaml/Credential/KeyHelper.php +++ b/src/LightSaml/Credential/KeyHelper.php @@ -26,7 +26,7 @@ class KeyHelper */ public static function createPrivateKey($key, $passphrase, $isFile = false, $type = XMLSecurityKey::RSA_SHA1) { - $result = new XMLSecurityKey($type, array('type' => 'private')); + $result = new XMLSecurityKey($type, ['type' => 'private']); $result->passphrase = $passphrase; $result->loadKey($key, $isFile, false); @@ -34,8 +34,6 @@ public static function createPrivateKey($key, $passphrase, $isFile = false, $typ } /** - * @param X509Certificate $certificate - * * @return XMLSecurityKey */ public static function createPublicKey(X509Certificate $certificate) @@ -43,15 +41,14 @@ public static function createPublicKey(X509Certificate $certificate) if (null == $certificate->getSignatureAlgorithm()) { throw new LightSamlSecurityException('Unrecognized certificate signature algorithm'); } - $key = new XMLSecurityKey($certificate->getSignatureAlgorithm(), array('type' => 'public')); + $key = new XMLSecurityKey($certificate->getSignatureAlgorithm(), ['type' => 'public']); $key->loadKey($certificate->toPem(), false, true); return $key; } /** - * @param XMLSecurityKey $key - * @param string $algorithm + * @param string $algorithm * * @throws \LightSaml\Error\LightSamlSecurityException * @throws \InvalidArgumentException @@ -77,7 +74,7 @@ public static function castKey(XMLSecurityKey $key, $algorithm) throw new LightSamlSecurityException('Missing key in public key details.'); } - $newKey = new XMLSecurityKey($algorithm, array('type' => 'public')); + $newKey = new XMLSecurityKey($algorithm, ['type' => 'public']); $newKey->loadKey($keyInfo['key']); return $newKey; diff --git a/src/LightSaml/Credential/X509Certificate.php b/src/LightSaml/Credential/X509Certificate.php index 33d15a25..cf383674 100644 --- a/src/LightSaml/Credential/X509Certificate.php +++ b/src/LightSaml/Credential/X509Certificate.php @@ -28,7 +28,7 @@ class X509Certificate /** @var string */ protected $data; - /** @var null|array */ + /** @var array|null */ protected $info; /** @var string */ diff --git a/src/LightSaml/Credential/X509Credential.php b/src/LightSaml/Credential/X509Credential.php index 4a81cd49..ed39afb1 100644 --- a/src/LightSaml/Credential/X509Credential.php +++ b/src/LightSaml/Credential/X509Credential.php @@ -19,8 +19,7 @@ class X509Credential extends AbstractCredential implements X509CredentialInterfa protected $certificate; /** - * @param X509Certificate $certificate - * @param XMLSecurityKey $privateKey + * @param XMLSecurityKey $privateKey */ public function __construct(X509Certificate $certificate, XMLSecurityKey $privateKey = null) { @@ -29,7 +28,7 @@ public function __construct(X509Certificate $certificate, XMLSecurityKey $privat $this->setPublicKey(KeyHelper::createPublicKey($certificate)); - $this->setKeyNames(array($this->getCertificate()->getName())); + $this->setKeyNames([$this->getCertificate()->getName()]); if ($privateKey) { $this->setPrivateKey($privateKey); diff --git a/src/LightSaml/Criteria/CriteriaSet.php b/src/LightSaml/Criteria/CriteriaSet.php index 9e3ef0d3..e81ddbf3 100644 --- a/src/LightSaml/Criteria/CriteriaSet.php +++ b/src/LightSaml/Criteria/CriteriaSet.php @@ -14,12 +14,12 @@ class CriteriaSet { /** @var array|CriteriaInterface[] */ - protected $criterions = array(); + protected $criterions = []; /** * @param CriteriaInterface[] $criterions */ - public function __construct(array $criterions = array()) + public function __construct(array $criterions = []) { foreach ($criterions as $criterion) { $this->add($criterion); @@ -27,8 +27,6 @@ public function __construct(array $criterions = array()) } /** - * @param CriteriaInterface $criteria - * * @return CriteriaSet */ public function add(CriteriaInterface $criteria) @@ -39,8 +37,6 @@ public function add(CriteriaInterface $criteria) } /** - * @param CriteriaInterface $criteria - * * @return CriteriaSet */ public function addIfNone(CriteriaInterface $criteria) @@ -53,8 +49,6 @@ public function addIfNone(CriteriaInterface $criteria) } /** - * @param CriteriaSet $criteriaSet - * * @return CriteriaSet */ public function addAll(CriteriaSet $criteriaSet) @@ -99,7 +93,7 @@ public function all() */ public function get($class) { - $result = array(); + $result = []; foreach ($this->criterions as $criteria) { if ($criteria instanceof $class) { $result[] = $criteria; diff --git a/src/LightSaml/Error/LightSamlAuthenticationException.php b/src/LightSaml/Error/LightSamlAuthenticationException.php index e366a929..a7d45cf9 100644 --- a/src/LightSaml/Error/LightSamlAuthenticationException.php +++ b/src/LightSaml/Error/LightSamlAuthenticationException.php @@ -19,10 +19,9 @@ class LightSamlAuthenticationException extends LightSamlValidationException protected $response; /** - * @param StatusResponse $response - * @param string $message - * @param int $code - * @param \Exception $previous + * @param string $message + * @param int $code + * @param \Exception $previous */ public function __construct(StatusResponse $response, $message = '', $code = 0, \Exception $previous = null) { diff --git a/src/LightSaml/Error/LightSamlContextException.php b/src/LightSaml/Error/LightSamlContextException.php index 40cb0d8f..78bf769b 100644 --- a/src/LightSaml/Error/LightSamlContextException.php +++ b/src/LightSaml/Error/LightSamlContextException.php @@ -19,10 +19,9 @@ class LightSamlContextException extends LightSamlException protected $context; /** - * @param ContextInterface $context - * @param string $message - * @param int $code - * @param \Exception $previous + * @param string $message + * @param int $code + * @param \Exception $previous */ public function __construct(ContextInterface $context, $message = '', $code = 0, \Exception $previous = null) { diff --git a/src/LightSaml/Meta/ParameterBag.php b/src/LightSaml/Meta/ParameterBag.php index fc55e442..9384bf23 100644 --- a/src/LightSaml/Meta/ParameterBag.php +++ b/src/LightSaml/Meta/ParameterBag.php @@ -23,7 +23,7 @@ class ParameterBag implements \IteratorAggregate, \Countable, \Serializable /** * @param array $parameters An array of parameters */ - public function __construct(array $parameters = array()) + public function __construct(array $parameters = []) { $this->parameters = $parameters; } @@ -53,17 +53,15 @@ public function keys() * * @param array $parameters An array of parameters */ - public function replace(array $parameters = array()) + public function replace(array $parameters = []) { $this->parameters = $parameters; } /** * Adds parameters. - * - * @param array $parameters */ - public function add(array $parameters = array()) + public function add(array $parameters = []) { $this->parameters = array_replace($this->parameters, $parameters); } diff --git a/src/LightSaml/Model/AbstractSamlModel.php b/src/LightSaml/Model/AbstractSamlModel.php index a28eaa71..12864147 100644 --- a/src/LightSaml/Model/AbstractSamlModel.php +++ b/src/LightSaml/Model/AbstractSamlModel.php @@ -18,10 +18,8 @@ abstract class AbstractSamlModel implements SamlElementInterface { /** - * @param string $name - * @param null|string $namespace - * @param \DOMNode $parent - * @param SerializationContext $context + * @param string $name + * @param string|null $namespace * * @return \DOMElement */ @@ -38,10 +36,8 @@ protected function createElement($name, $namespace, \DOMNode $parent, Serializat } /** - * @param string $name - * @param \DOMNode $parent - * @param SerializationContext $context - * @param string|null $namespace + * @param string $name + * @param string|null $namespace * * @throws \LogicException */ @@ -66,10 +62,8 @@ private function oneElementToXml($name, \DOMNode $parent, SerializationContext $ } /** - * @param array|string[] $names - * @param \DOMNode $parent - * @param SerializationContext $context - * @param string|null $namespace + * @param array|string[] $names + * @param string|null $namespace */ protected function singleElementsToXml(array $names, \DOMNode $parent, SerializationContext $context, $namespace = null) { @@ -79,11 +73,9 @@ protected function singleElementsToXml(array $names, \DOMNode $parent, Serializa } /** - * @param array|null $value - * @param \DOMNode $node - * @param SerializationContext $context - * @param null|string $nodeName - * @param null|string $namespaceUri + * @param array|null $value + * @param string|null $nodeName + * @param string|null $namespaceUri * * @throws \LogicException */ @@ -117,12 +109,10 @@ protected function manyElementsToXml($value, \DOMNode $node, SerializationContex } /** - * @param \DOMElement $node - * @param DeserializationContext $context - * @param string $nodeName - * @param string|null $namespacePrefix - * @param string $class - * @param string $methodName + * @param string $nodeName + * @param string|null $namespacePrefix + * @param string $class + * @param string $methodName * * @throws \LogicException */ @@ -152,8 +142,7 @@ protected function manyElementsFromXml(\DOMElement $node, DeserializationContext } /** - * @param string $name - * @param \DOMElement $element + * @param string $name * * @throws \LogicException * @@ -177,7 +166,6 @@ protected function singleAttributeToXml($name, \DOMElement $element) /** * @param array|string[] $names - * @param \DOMElement $element */ protected function attributesToXml(array $names, \DOMElement $element) { @@ -187,9 +175,8 @@ protected function attributesToXml(array $names, \DOMElement $element) } /** - * @param \DOMNode $node - * @param string $expectedName - * @param string $expectedNamespaceUri + * @param string $expectedName + * @param string $expectedNamespaceUri */ protected function checkXmlNodeName(\DOMNode &$node, $expectedName, $expectedNamespaceUri) { @@ -200,25 +187,14 @@ protected function checkXmlNodeName(\DOMNode &$node, $expectedName, $expectedNam $node = $node->nextSibling; } if (null === $node) { - throw new LightSamlXmlException(sprintf( - "Unable to find expected '%s' xml node and '%s' namespace", - $expectedName, - $expectedNamespaceUri - )); + throw new LightSamlXmlException(sprintf("Unable to find expected '%s' xml node and '%s' namespace", $expectedName, $expectedNamespaceUri)); } elseif ($node->localName != $expectedName || $node->namespaceURI != $expectedNamespaceUri) { - throw new LightSamlXmlException(sprintf( - "Expected '%s' xml node and '%s' namespace but got node '%s' and namespace '%s'", - $expectedName, - $expectedNamespaceUri, - $node->localName, - $node->namespaceURI - )); + throw new LightSamlXmlException(sprintf("Expected '%s' xml node and '%s' namespace but got node '%s' and namespace '%s'", $expectedName, $expectedNamespaceUri, $node->localName, $node->namespaceURI)); } } /** - * @param \DOMElement $node - * @param string $attributeName + * @param string $attributeName */ protected function singleAttributeFromXml(\DOMElement $node, $attributeName) { @@ -232,11 +208,9 @@ protected function singleAttributeFromXml(\DOMElement $node, $attributeName) } /** - * @param \DOMElement $node - * @param DeserializationContext $context - * @param string $elementName - * @param string $class - * @param string $namespacePrefix + * @param string $elementName + * @param string $class + * @param string $namespacePrefix * * @throws \LogicException */ @@ -253,22 +227,14 @@ protected function oneElementFromXml(\DOMElement $node, DeserializationContext $ if ($value) { $setter = 'set'.$elementName; if (false == method_exists($this, $setter)) { - throw new \LogicException(sprintf( - "Unable to find setter for element '%s' in class '%s'", - $elementName, - get_class($this) - )); + throw new \LogicException(sprintf("Unable to find setter for element '%s' in class '%s'", $elementName, get_class($this))); } if ($class) { /** @var AbstractSamlModel $object */ $object = new $class(); if (false == $object instanceof \LightSaml\Model\SamlElementInterface) { - throw new \LogicException(sprintf( - "Specified class '%s' for element '%s' must implement SamlElementInterface", - $class, - $elementName - )); + throw new \LogicException(sprintf("Specified class '%s' for element '%s' must implement SamlElementInterface", $class, $elementName)); } $object->deserialize($value, $context); @@ -281,9 +247,7 @@ protected function oneElementFromXml(\DOMElement $node, DeserializationContext $ } /** - * @param \DOMElement $node - * @param DeserializationContext $context - * @param array $options elementName=>class + * @param array $options elementName=>class */ protected function singleElementsFromXml(\DOMElement $node, DeserializationContext $context, array $options) { @@ -292,10 +256,6 @@ protected function singleElementsFromXml(\DOMElement $node, DeserializationConte } } - /** - * @param \DOMElement $node - * @param array $attributeNames - */ protected function attributesFromXml(\DOMElement $node, array $attributeNames) { foreach ($attributeNames as $attributeName) { @@ -320,11 +280,7 @@ private function getPropertyValue($name) $getter = 'get'.$name; } if (false == method_exists($this, $getter)) { - throw new \LogicException(sprintf( - "Unable to find getter method for '%s' on '%s'", - $name, - get_class($this) - )); + throw new \LogicException(sprintf("Unable to find getter method for '%s' on '%s'", $name, get_class($this))); } $value = $this->{$getter}(); diff --git a/src/LightSaml/Model/Assertion/AbstractNameID.php b/src/LightSaml/Model/Assertion/AbstractNameID.php index eef13c1f..ae2fbbe6 100644 --- a/src/LightSaml/Model/Assertion/AbstractNameID.php +++ b/src/LightSaml/Model/Assertion/AbstractNameID.php @@ -12,9 +12,9 @@ namespace LightSaml\Model\Assertion; use LightSaml\Error\LightSamlModelException; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; abstract class AbstractNameID extends AbstractSamlModel @@ -55,7 +55,7 @@ public function __construct($value = null, $format = null) } /** - * @param null|string $format + * @param string|null $format * * @return AbstractNameID */ @@ -67,7 +67,7 @@ public function setFormat($format) } /** - * @return null|string + * @return string|null */ public function getFormat() { @@ -75,7 +75,7 @@ public function getFormat() } /** - * @param null|string $nameQualifier + * @param string|null $nameQualifier * * @return AbstractNameID */ @@ -87,7 +87,7 @@ public function setNameQualifier($nameQualifier) } /** - * @return null|string + * @return string|null */ public function getNameQualifier() { @@ -95,7 +95,7 @@ public function getNameQualifier() } /** - * @param null|string $spNameQualifier + * @param string|null $spNameQualifier * * @return AbstractNameID */ @@ -107,7 +107,7 @@ public function setSPNameQualifier($spNameQualifier) } /** - * @return null|string + * @return string|null */ public function getSPNameQualifier() { @@ -115,7 +115,7 @@ public function getSPNameQualifier() } /** - * @param null|string $spProvidedId + * @param string|null $spProvidedId * * @return AbstractNameID */ @@ -127,7 +127,7 @@ public function setSPProvidedID($spProvidedId) } /** - * @return null|string + * @return string|null */ public function getSPProvidedID() { @@ -162,9 +162,6 @@ protected function prepareForXml() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return \DOMElement */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -177,19 +174,15 @@ public function serialize(\DOMNode $parent, SerializationContext $context) } /* @var \DOMElement $parent */ - $this->attributesToXml(array('Format', 'NameQualifier', 'SPNameQualifier', 'SPProvidedID'), $result); + $this->attributesToXml(['Format', 'NameQualifier', 'SPNameQualifier', 'SPProvidedID'], $result); $result->nodeValue = $this->getValue(); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, $this->getElementName(), SamlConstants::NS_ASSERTION); - $this->attributesFromXml($node, array('NameQualifier', 'Format', 'SPNameQualifier', 'SPProvidedID')); + $this->attributesFromXml($node, ['NameQualifier', 'Format', 'SPNameQualifier', 'SPProvidedID']); $this->setValue($node->textContent); } diff --git a/src/LightSaml/Model/Assertion/Assertion.php b/src/LightSaml/Model/Assertion/Assertion.php index 804988b6..186152ee 100644 --- a/src/LightSaml/Model/Assertion/Assertion.php +++ b/src/LightSaml/Model/Assertion/Assertion.php @@ -12,9 +12,9 @@ namespace LightSaml\Model\Assertion; use LightSaml\Helper; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\XmlDSig\Signature; use LightSaml\SamlConstants; @@ -64,7 +64,7 @@ class Assertion extends AbstractSamlModel /** * @var array|AbstractStatement[]|AuthnStatement[]|AttributeStatement[] */ - protected $items = array(); + protected $items = []; //endregion @@ -135,8 +135,6 @@ public function hasAnySessionIndex() //region Getters & Setters /** - * @param Conditions|null $conditions - * * @return Assertion */ public function setConditions(Conditions $conditions = null) @@ -261,8 +259,6 @@ public function getSignature() } /** - * @param Subject $subject - * * @return Assertion */ public function setSubject(Subject $subject) @@ -301,8 +297,6 @@ public function getVersion() } /** - * @param AbstractStatement $statement - * * @return Assertion */ public function addItem(AbstractStatement $statement) @@ -325,7 +319,7 @@ public function getAllItems() */ public function getAllAuthnStatements() { - $result = array(); + $result = []; foreach ($this->items as $item) { if ($item instanceof AuthnStatement) { $result[] = $item; @@ -340,7 +334,7 @@ public function getAllAuthnStatements() */ public function getAllAttributeStatements() { - $result = array(); + $result = []; foreach ($this->items as $item) { if ($item instanceof AttributeStatement) { $result[] = $item; @@ -405,9 +399,6 @@ protected function prepareForXml() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -416,10 +407,10 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $result = $this->createElement('Assertion', SamlConstants::NS_ASSERTION, $parent, $context); - $this->attributesToXml(array('ID', 'Version', 'IssueInstant'), $result); + $this->attributesToXml(['ID', 'Version', 'IssueInstant'], $result); $this->singleElementsToXml( - array('Issuer', 'Subject', 'Conditions'), + ['Issuer', 'Subject', 'Conditions'], $result, $context ); @@ -429,24 +420,20 @@ public function serialize(\DOMNode $parent, SerializationContext $context) } // must be added at the end - $this->singleElementsToXml(array('Signature'), $result, $context); + $this->singleElementsToXml(['Signature'], $result, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'Assertion', SamlConstants::NS_ASSERTION); - $this->attributesFromXml($node, array('ID', 'Version', 'IssueInstant')); + $this->attributesFromXml($node, ['ID', 'Version', 'IssueInstant']); - $this->singleElementsFromXml($node, $context, array( - 'Issuer' => array('saml', 'LightSaml\Model\Assertion\Issuer'), - 'Subject' => array('saml', 'LightSaml\Model\Assertion\Subject'), - 'Conditions' => array('saml', 'LightSaml\Model\Assertion\Conditions'), - )); + $this->singleElementsFromXml($node, $context, [ + 'Issuer' => ['saml', 'LightSaml\Model\Assertion\Issuer'], + 'Subject' => ['saml', 'LightSaml\Model\Assertion\Subject'], + 'Conditions' => ['saml', 'LightSaml\Model\Assertion\Conditions'], + ]); $this->manyElementsFromXml( $node, @@ -466,8 +453,8 @@ public function deserialize(\DOMNode $node, DeserializationContext $context) 'addItem' ); - $this->singleElementsFromXml($node, $context, array( - 'Signature' => array('ds', 'LightSaml\Model\XmlDSig\SignatureXmlReader'), - )); + $this->singleElementsFromXml($node, $context, [ + 'Signature' => ['ds', 'LightSaml\Model\XmlDSig\SignatureXmlReader'], + ]); } } diff --git a/src/LightSaml/Model/Assertion/Attribute.php b/src/LightSaml/Model/Assertion/Attribute.php index 4b193cc8..4dc48ba9 100644 --- a/src/LightSaml/Model/Assertion/Attribute.php +++ b/src/LightSaml/Model/Assertion/Attribute.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Assertion; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class Attribute extends AbstractSamlModel @@ -38,7 +38,7 @@ public function __construct($name = null, $value = null) { $this->name = $name; if ($value) { - $this->attributeValue = is_array($value) ? $value : array($value); + $this->attributeValue = is_array($value) ? $value : [$value]; } } @@ -50,7 +50,7 @@ public function __construct($name = null, $value = null) public function addAttributeValue($attributeValue) { if (false == is_array($this->attributeValue)) { - $this->attributeValue = array(); + $this->attributeValue = []; } $this->attributeValue[] = $attributeValue; @@ -65,7 +65,7 @@ public function addAttributeValue($attributeValue) public function setAttributeValue($attributeValue) { if (false == is_array($attributeValue)) { - $attributeValue = array($attributeValue); + $attributeValue = [$attributeValue]; } $this->attributeValue = $attributeValue; @@ -151,31 +151,24 @@ public function getNameFormat() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('Attribute', SamlConstants::NS_ASSERTION, $parent, $context); - $this->attributesToXml(array('Name', 'NameFormat', 'FriendlyName'), $result); + $this->attributesToXml(['Name', 'NameFormat', 'FriendlyName'], $result); $this->manyElementsToXml($this->getAllAttributeValues(), $result, $context, 'AttributeValue', SamlConstants::NS_ASSERTION); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'Attribute', SamlConstants::NS_ASSERTION); - $this->attributesFromXml($node, array('Name', 'NameFormat', 'FriendlyName')); + $this->attributesFromXml($node, ['Name', 'NameFormat', 'FriendlyName']); - $this->attributeValue = array(); + $this->attributeValue = []; $this->manyElementsFromXml($node, $context, 'AttributeValue', 'saml', null, 'addAttributeValue'); } } diff --git a/src/LightSaml/Model/Assertion/AttributeStatement.php b/src/LightSaml/Model/Assertion/AttributeStatement.php index abbe090c..29c27c00 100644 --- a/src/LightSaml/Model/Assertion/AttributeStatement.php +++ b/src/LightSaml/Model/Assertion/AttributeStatement.php @@ -20,11 +20,9 @@ class AttributeStatement extends AbstractStatement /** * @var Attribute[] */ - protected $attributes = array(); + protected $attributes = []; /** - * @param Attribute $attribute - * * @return AttributeStatement */ public function addAttribute(Attribute $attribute) @@ -61,9 +59,6 @@ public function getFirstAttributeByName($name) } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -73,15 +68,11 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $this->manyElementsToXml($this->getAllAttributes(), $result, $context, null); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'AttributeStatement', SamlConstants::NS_ASSERTION); - $this->attributes = array(); + $this->attributes = []; $this->manyElementsFromXml( $node, $context, diff --git a/src/LightSaml/Model/Assertion/AudienceRestriction.php b/src/LightSaml/Model/Assertion/AudienceRestriction.php index be098cfb..ddb243d5 100644 --- a/src/LightSaml/Model/Assertion/AudienceRestriction.php +++ b/src/LightSaml/Model/Assertion/AudienceRestriction.php @@ -20,15 +20,15 @@ class AudienceRestriction extends AbstractCondition /** * @var string[] */ - protected $audience = array(); + protected $audience = []; /** * @param string|string[] $audience */ - public function __construct($audience = array()) + public function __construct($audience = []) { if (false == is_array($audience)) { - $audience = array($audience); + $audience = [$audience]; } $this->audience = $audience; } @@ -71,10 +71,6 @@ public function hasAudience($value) return false; } - /** - * @param \DOMNode $parent - * @param SerializationContext $context - */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('AudienceRestriction', SamlConstants::NS_ASSERTION, $parent, $context); @@ -82,15 +78,11 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $this->manyElementsToXml($this->getAllAudience(), $result, $context, 'Audience', SamlConstants::NS_ASSERTION); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'AudienceRestriction', SamlConstants::NS_ASSERTION); - $this->audience = array(); + $this->audience = []; $this->manyElementsFromXml($node, $context, 'Audience', 'saml', null, 'addAudience'); } } diff --git a/src/LightSaml/Model/Assertion/AuthnContext.php b/src/LightSaml/Model/Assertion/AuthnContext.php index fffe3181..ae33cd1e 100644 --- a/src/LightSaml/Model/Assertion/AuthnContext.php +++ b/src/LightSaml/Model/Assertion/AuthnContext.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Assertion; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class AuthnContext extends AbstractSamlModel @@ -59,7 +59,7 @@ public function getAuthenticatingAuthority() } /** - * @param null|string $authnContextClassRef + * @param string|null $authnContextClassRef * * @return AuthnContext */ @@ -71,7 +71,7 @@ public function setAuthnContextClassRef($authnContextClassRef) } /** - * @return null|string + * @return string|null */ public function getAuthnContextClassRef() { @@ -79,7 +79,7 @@ public function getAuthnContextClassRef() } /** - * @param null|string $authnContextDecl + * @param string|null $authnContextDecl * * @return AuthnContext */ @@ -91,7 +91,7 @@ public function setAuthnContextDecl($authnContextDecl) } /** - * @return null|string + * @return string|null */ public function getAuthnContextDecl() { @@ -99,7 +99,7 @@ public function getAuthnContextDecl() } /** - * @param null|string $authnContextDeclRef + * @param string|null $authnContextDeclRef * * @return AuthnContext */ @@ -111,7 +111,7 @@ public function setAuthnContextDeclRef($authnContextDeclRef) } /** - * @return null|string + * @return string|null */ public function getAuthnContextDeclRef() { @@ -119,9 +119,6 @@ public function getAuthnContextDeclRef() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -129,26 +126,22 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $result = $this->createElement('AuthnContext', SamlConstants::NS_ASSERTION, $parent, $context); $this->singleElementsToXml( - array('AuthnContextClassRef', 'AuthnContextDecl', 'AuthnContextDeclRef', 'AuthenticatingAuthority'), + ['AuthnContextClassRef', 'AuthnContextDecl', 'AuthnContextDeclRef', 'AuthenticatingAuthority'], $result, $context, SamlConstants::NS_ASSERTION ); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'AuthnContext', SamlConstants::NS_ASSERTION); - $this->singleElementsFromXml($node, $context, array( - 'AuthnContextClassRef' => array('saml', null), - 'AuthnContextDecl' => array('saml', null), - 'AuthnContextDeclRef' => array('saml', null), - 'AuthenticatingAuthority' => array('saml', null), - )); + $this->singleElementsFromXml($node, $context, [ + 'AuthnContextClassRef' => ['saml', null], + 'AuthnContextDecl' => ['saml', null], + 'AuthnContextDeclRef' => ['saml', null], + 'AuthenticatingAuthority' => ['saml', null], + ]); } } diff --git a/src/LightSaml/Model/Assertion/AuthnStatement.php b/src/LightSaml/Model/Assertion/AuthnStatement.php index e5f63da7..6156e9f5 100644 --- a/src/LightSaml/Model/Assertion/AuthnStatement.php +++ b/src/LightSaml/Model/Assertion/AuthnStatement.php @@ -44,8 +44,6 @@ class AuthnStatement extends AbstractStatement protected $subjectLocality; /** - * @param AuthnContext $authnContext - * * @return AuthnStatement */ public function setAuthnContext(AuthnContext $authnContext) @@ -108,7 +106,7 @@ public function getAuthnInstantDateTime() } /** - * @param null|string $sessionIndex + * @param string|null $sessionIndex * * @return AuthnStatement */ @@ -120,7 +118,7 @@ public function setSessionIndex($sessionIndex) } /** - * @return null|string + * @return string|null */ public function getSessionIndex() { @@ -192,9 +190,6 @@ public function getSubjectLocality() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -202,30 +197,26 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $result = $this->createElement('AuthnStatement', SamlConstants::NS_ASSERTION, $parent, $context); $this->attributesToXml( - array('AuthnInstant', 'SessionNotOnOrAfter', 'SessionIndex'), + ['AuthnInstant', 'SessionNotOnOrAfter', 'SessionIndex'], $result ); $this->singleElementsToXml( - array('SubjectLocality', 'AuthnContext'), + ['SubjectLocality', 'AuthnContext'], $result, $context ); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'AuthnStatement', SamlConstants::NS_ASSERTION); - $this->attributesFromXml($node, array('AuthnInstant', 'SessionNotOnOrAfter', 'SessionIndex')); + $this->attributesFromXml($node, ['AuthnInstant', 'SessionNotOnOrAfter', 'SessionIndex']); - $this->singleElementsFromXml($node, $context, array( - 'SubjectLocality' => array('saml', 'LightSaml\Model\Assertion\SubjectLocality'), - 'AuthnContext' => array('saml', 'LightSaml\Model\Assertion\AuthnContext'), - )); + $this->singleElementsFromXml($node, $context, [ + 'SubjectLocality' => ['saml', 'LightSaml\Model\Assertion\SubjectLocality'], + 'AuthnContext' => ['saml', 'LightSaml\Model\Assertion\AuthnContext'], + ]); } } diff --git a/src/LightSaml/Model/Assertion/Conditions.php b/src/LightSaml/Model/Assertion/Conditions.php index a6404b2c..fab8d015 100644 --- a/src/LightSaml/Model/Assertion/Conditions.php +++ b/src/LightSaml/Model/Assertion/Conditions.php @@ -12,9 +12,9 @@ namespace LightSaml\Model\Assertion; use LightSaml\Helper; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class Conditions extends AbstractSamlModel @@ -32,11 +32,9 @@ class Conditions extends AbstractSamlModel /** * @var array|AbstractCondition[]|AudienceRestriction[]|OneTimeUse[]|ProxyRestriction[] */ - protected $items = array(); + protected $items = []; /** - * @param AbstractCondition $item - * * @return Conditions */ public function addItem(AbstractCondition $item) @@ -59,7 +57,7 @@ public function getAllItems() */ public function getAllAudienceRestrictions() { - $result = array(); + $result = []; foreach ($this->items as $item) { if ($item instanceof AudienceRestriction) { $result[] = $item; @@ -88,7 +86,7 @@ public function getFirstAudienceRestriction() */ public function getAllOneTimeUses() { - $result = array(); + $result = []; foreach ($this->items as $item) { if ($item instanceof OneTimeUse) { $result[] = $item; @@ -117,7 +115,7 @@ public function getFirstOneTimeUse() */ public function getAllProxyRestrictions() { - $result = array(); + $result = []; foreach ($this->items as $item) { if ($item instanceof ProxyRestriction) { $result[] = $item; @@ -230,9 +228,6 @@ public function getNotOnOrAfterDateTime() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -240,7 +235,7 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $result = $this->createElement('Conditions', SamlConstants::NS_ASSERTION, $parent, $context); $this->attributesToXml( - array('NotBefore', 'NotOnOrAfter'), + ['NotBefore', 'NotOnOrAfter'], $result ); @@ -249,15 +244,11 @@ public function serialize(\DOMNode $parent, SerializationContext $context) } } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'Conditions', SamlConstants::NS_ASSERTION); - $this->attributesFromXml($node, array('NotBefore', 'NotOnOrAfter')); + $this->attributesFromXml($node, ['NotBefore', 'NotOnOrAfter']); $this->manyElementsFromXml( $node, diff --git a/src/LightSaml/Model/Assertion/EncryptedAssertionReader.php b/src/LightSaml/Model/Assertion/EncryptedAssertionReader.php index c03cc221..25362639 100644 --- a/src/LightSaml/Model/Assertion/EncryptedAssertionReader.php +++ b/src/LightSaml/Model/Assertion/EncryptedAssertionReader.php @@ -17,8 +17,7 @@ class EncryptedAssertionReader extends EncryptedElementReader { /** - * @param XMLSecurityKey[] $inputKeys - * @param DeserializationContext $deserializationContext + * @param XMLSecurityKey[] $inputKeys * * @return Assertion */ @@ -30,8 +29,7 @@ public function decryptMultiAssertion(array $inputKeys, DeserializationContext $ } /** - * @param XMLSecurityKey $credential - * @param DeserializationContext $deserializationContext + * @param XMLSecurityKey $credential * * @return Assertion */ @@ -43,9 +41,6 @@ public function decryptAssertion($credential, DeserializationContext $deserializ } /** - * @param \DOMElement $dom - * @param DeserializationContext $deserializationContext - * * @return Assertion */ protected function getAssertionFromDom(\DOMElement $dom, DeserializationContext $deserializationContext) diff --git a/src/LightSaml/Model/Assertion/EncryptedAssertionWriter.php b/src/LightSaml/Model/Assertion/EncryptedAssertionWriter.php index 67c487c9..c11ab740 100644 --- a/src/LightSaml/Model/Assertion/EncryptedAssertionWriter.php +++ b/src/LightSaml/Model/Assertion/EncryptedAssertionWriter.php @@ -17,9 +17,6 @@ class EncryptedAssertionWriter extends EncryptedElementWriter { /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return \DOMElement */ protected function createRootElement(\DOMNode $parent, SerializationContext $context) diff --git a/src/LightSaml/Model/Assertion/EncryptedElementReader.php b/src/LightSaml/Model/Assertion/EncryptedElementReader.php index 3ebd1a8b..a672670e 100644 --- a/src/LightSaml/Model/Assertion/EncryptedElementReader.php +++ b/src/LightSaml/Model/Assertion/EncryptedElementReader.php @@ -12,12 +12,12 @@ namespace LightSaml\Model\Assertion; use LightSaml\Credential\CredentialInterface; -use LightSaml\Model\Context\DeserializationContext; -use LightSaml\Model\Context\SerializationContext; use LightSaml\Error\LightSamlSecurityException; use LightSaml\Error\LightSamlXmlException; -use RobRichards\XMLSecLibs\XMLSecurityKey; +use LightSaml\Model\Context\DeserializationContext; +use LightSaml\Model\Context\SerializationContext; use RobRichards\XMLSecLibs\XMLSecEnc; +use RobRichards\XMLSecLibs\XMLSecurityKey; class EncryptedElementReader extends EncryptedElement { @@ -47,9 +47,6 @@ public function getSymmetricKeyInfo() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @throws \LogicException * * @return void @@ -59,10 +56,6 @@ public function serialize(\DOMNode $parent, SerializationContext $context) throw new \LogicException('EncryptedElementReader can not be used for serialization'); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $list = $context->getXpath()->query('xenc:EncryptedData', $node); @@ -121,8 +114,6 @@ public function decryptMulti(array $inputKeys) } /** - * @param XMLSecurityKey $inputKey - * * @throws \LogicException * @throws \LightSaml\Error\LightSamlXmlException * @throws \LightSaml\Error\LightSamlSecurityException @@ -195,8 +186,6 @@ protected function decryptCipher() } /** - * @param XMLSecurityKey $inputKey - * * @throws \Exception */ protected function decryptSymmetricKey(XMLSecurityKey $inputKey) @@ -209,10 +198,7 @@ protected function decryptSymmetricKey(XMLSecurityKey $inputKey) if (null === $keySize) { // To protect against "key oracle" attacks, we need to be able to create a // symmetric key, and for that we need to know the key size. - throw new LightSamlSecurityException(sprintf( - "Unknown key size for encryption algorithm: '%s'", - $this->symmetricKey->type - )); + throw new LightSamlSecurityException(sprintf("Unknown key size for encryption algorithm: '%s'", $this->symmetricKey->type)); } /** @var string $key */ @@ -221,12 +207,7 @@ protected function decryptSymmetricKey(XMLSecurityKey $inputKey) throw new \LogicException('Expected string'); } if (strlen($key) != $keySize) { - throw new LightSamlSecurityException(sprintf( - "Unexpected key size of '%s' bits for encryption algorithm '%s', expected '%s' bits size", - strlen($key) * 8, - $this->symmetricKey->type, - $keySize - )); + throw new LightSamlSecurityException(sprintf("Unexpected key size of '%s' bits for encryption algorithm '%s', expected '%s' bits size", strlen($key) * 8, $this->symmetricKey->type, $keySize)); } $this->symmetricKey->loadkey($key); @@ -248,8 +229,6 @@ protected function loadSymmetricKey() } /** - * @param XMLSecurityKey $symmetricKey - * * @throws \LightSaml\Error\LightSamlXmlException * * @return XMLSecurityKey diff --git a/src/LightSaml/Model/Assertion/EncryptedElementWriter.php b/src/LightSaml/Model/Assertion/EncryptedElementWriter.php index 511c2a4f..4968f97c 100644 --- a/src/LightSaml/Model/Assertion/EncryptedElementWriter.php +++ b/src/LightSaml/Model/Assertion/EncryptedElementWriter.php @@ -11,12 +11,12 @@ namespace LightSaml\Model\Assertion; -use LightSaml\Model\Context\DeserializationContext; -use LightSaml\Model\Context\SerializationContext; use LightSaml\Error\LightSamlException; use LightSaml\Model\AbstractSamlModel; -use RobRichards\XMLSecLibs\XMLSecurityKey; +use LightSaml\Model\Context\DeserializationContext; +use LightSaml\Model\Context\SerializationContext; use RobRichards\XMLSecLibs\XMLSecEnc; +use RobRichards\XMLSecLibs\XMLSecurityKey; abstract class EncryptedElementWriter extends EncryptedElement { @@ -40,9 +40,6 @@ public function __construct($blockEncryptionAlgorithm = XMLSecurityKey::AES128_C } /** - * @param AbstractSamlModel $object - * @param XMLSecurityKey $key - * * @return SerializationContext */ public function encrypt(AbstractSamlModel $object, XMLSecurityKey $key) @@ -89,17 +86,11 @@ public function encrypt(AbstractSamlModel $object, XMLSecurityKey $key) } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return \DOMElement */ abstract protected function createRootElement(\DOMNode $parent, SerializationContext $context); /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -113,10 +104,6 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $root->appendChild($context->getDocument()->importNode($this->encryptedElement, true)); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { throw new \LogicException('EncryptedElementWriter can not be used for deserialization'); diff --git a/src/LightSaml/Model/Assertion/OneTimeUse.php b/src/LightSaml/Model/Assertion/OneTimeUse.php index 95ee79d1..1cd6c865 100644 --- a/src/LightSaml/Model/Assertion/OneTimeUse.php +++ b/src/LightSaml/Model/Assertion/OneTimeUse.php @@ -18,9 +18,6 @@ class OneTimeUse extends AbstractCondition { /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -28,10 +25,6 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $this->createElement('OneTimeUse', SamlConstants::NS_ASSERTION, $parent, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'OneTimeUse', SamlConstants::NS_ASSERTION); diff --git a/src/LightSaml/Model/Assertion/ProxyRestriction.php b/src/LightSaml/Model/Assertion/ProxyRestriction.php index 53c6572b..78ba7c57 100644 --- a/src/LightSaml/Model/Assertion/ProxyRestriction.php +++ b/src/LightSaml/Model/Assertion/ProxyRestriction.php @@ -45,7 +45,7 @@ public function __construct($count = null, array $audience = null) public function addAudience($audience) { if (false == is_array($this->audience)) { - $this->audience = array(); + $this->audience = []; } $this->audience[] = (string) $audience; @@ -53,7 +53,7 @@ public function addAudience($audience) } /** - * @return null|\string[] + * @return \string[]|null */ public function getAllAudience() { @@ -81,29 +81,22 @@ public function getCount() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('ProxyRestriction', SamlConstants::NS_ASSERTION, $parent, $context); - $this->attributesToXml(array('count'), $result); + $this->attributesToXml(['count'], $result); $this->manyElementsToXml($this->getAllAudience(), $result, $context, 'Audience'); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'ProxyRestriction', SamlConstants::NS_ASSERTION); - $this->attributesFromXml($node, array('count')); + $this->attributesFromXml($node, ['count']); $this->manyElementsFromXml($node, $context, 'Audience', 'saml', null, 'addAudience'); } diff --git a/src/LightSaml/Model/Assertion/Subject.php b/src/LightSaml/Model/Assertion/Subject.php index 503db66d..ffd46c37 100644 --- a/src/LightSaml/Model/Assertion/Subject.php +++ b/src/LightSaml/Model/Assertion/Subject.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Assertion; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class Subject extends AbstractSamlModel @@ -22,7 +22,7 @@ class Subject extends AbstractSamlModel protected $nameId; /** @var SubjectConfirmation[] */ - protected $subjectConfirmation = array(); + protected $subjectConfirmation = []; /** * @param NameID $nameId @@ -45,8 +45,6 @@ public function getNameID() } /** - * @param SubjectConfirmation $subjectConfirmation - * * @return Subject */ public function addSubjectConfirmation(SubjectConfirmation $subjectConfirmation) @@ -83,7 +81,7 @@ public function getFirstSubjectConfirmation() */ public function getBearerConfirmations() { - $result = array(); + $result = []; if ($this->getAllSubjectConfirmations()) { foreach ($this->getAllSubjectConfirmations() as $confirmation) { if (SamlConstants::CONFIRMATION_METHOD_BEARER == $confirmation->getMethod()) { @@ -97,30 +95,23 @@ public function getBearerConfirmations() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('Subject', SamlConstants::NS_ASSERTION, $parent, $context); - $this->singleElementsToXml(array('NameID'), $result, $context); + $this->singleElementsToXml(['NameID'], $result, $context); $this->manyElementsToXml($this->getAllSubjectConfirmations(), $result, $context, null); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'Subject', SamlConstants::NS_ASSERTION); - $this->singleElementsFromXml($node, $context, array( - 'NameID' => array('saml', 'LightSaml\Model\Assertion\NameID'), - )); + $this->singleElementsFromXml($node, $context, [ + 'NameID' => ['saml', 'LightSaml\Model\Assertion\NameID'], + ]); $this->manyElementsFromXml( $node, diff --git a/src/LightSaml/Model/Assertion/SubjectConfirmation.php b/src/LightSaml/Model/Assertion/SubjectConfirmation.php index ac2b3aee..b3e83b9c 100644 --- a/src/LightSaml/Model/Assertion/SubjectConfirmation.php +++ b/src/LightSaml/Model/Assertion/SubjectConfirmation.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Assertion; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class SubjectConfirmation extends AbstractSamlModel @@ -51,8 +51,6 @@ public function getMethod() } /** - * @param EncryptedElement|null $encryptedId - * * @return SubjectConfirmation */ public function setEncryptedId(EncryptedElement $encryptedId = null) @@ -71,8 +69,6 @@ public function getEncryptedId() } /** - * @param NameID|null $nameId - * * @return SubjectConfirmation */ public function setNameID(NameID $nameId = null) @@ -91,8 +87,6 @@ public function getNameID() } /** - * @param SubjectConfirmationData|null $subjectConfirmationData - * * @return SubjectConfirmation */ public function setSubjectConfirmationData(SubjectConfirmationData $subjectConfirmationData = null) @@ -111,38 +105,31 @@ public function getSubjectConfirmationData() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('SubjectConfirmation', SamlConstants::NS_ASSERTION, $parent, $context); - $this->attributesToXml(array('Method'), $result); + $this->attributesToXml(['Method'], $result); $this->singleElementsToXml( - array('NameID', 'EncryptedID', 'SubjectConfirmationData'), + ['NameID', 'EncryptedID', 'SubjectConfirmationData'], $result, $context ); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'SubjectConfirmation', SamlConstants::NS_ASSERTION); - $this->attributesFromXml($node, array('Method')); + $this->attributesFromXml($node, ['Method']); - $this->singleElementsFromXml($node, $context, array( - 'NameID' => array('saml', 'LightSaml\Model\Assertion\NameID'), - 'EncryptedID' => array('saml', 'LightSaml\Model\Assertion\EncryptedID'), - 'SubjectConfirmationData' => array('saml', 'LightSaml\Model\Assertion\SubjectConfirmationData'), - )); + $this->singleElementsFromXml($node, $context, [ + 'NameID' => ['saml', 'LightSaml\Model\Assertion\NameID'], + 'EncryptedID' => ['saml', 'LightSaml\Model\Assertion\EncryptedID'], + 'SubjectConfirmationData' => ['saml', 'LightSaml\Model\Assertion\SubjectConfirmationData'], + ]); } } diff --git a/src/LightSaml/Model/Assertion/SubjectConfirmationData.php b/src/LightSaml/Model/Assertion/SubjectConfirmationData.php index 02c2f7b2..5106db48 100644 --- a/src/LightSaml/Model/Assertion/SubjectConfirmationData.php +++ b/src/LightSaml/Model/Assertion/SubjectConfirmationData.php @@ -12,9 +12,9 @@ namespace LightSaml\Model\Assertion; use LightSaml\Helper; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class SubjectConfirmationData extends AbstractSamlModel @@ -35,7 +35,7 @@ class SubjectConfirmationData extends AbstractSamlModel protected $recipient; /** - * @param null|string $address + * @param string|null $address * * @return SubjectConfirmationData */ @@ -47,7 +47,7 @@ public function setAddress($address) } /** - * @return null|string + * @return string|null */ public function getAddress() { @@ -55,7 +55,7 @@ public function getAddress() } /** - * @param null|string $inResponseTo + * @param string|null $inResponseTo * * @return SubjectConfirmationData */ @@ -67,7 +67,7 @@ public function setInResponseTo($inResponseTo) } /** - * @return null|string + * @return string|null */ public function getInResponseTo() { @@ -163,7 +163,7 @@ public function getNotOnOrAfterDateTime() } /** - * @param null|string $recipient + * @param string|null $recipient * * @return SubjectConfirmationData */ @@ -175,7 +175,7 @@ public function setRecipient($recipient) } /** - * @return null|string + * @return string|null */ public function getRecipient() { @@ -183,9 +183,6 @@ public function getRecipient() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -193,21 +190,17 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $result = $this->createElement('SubjectConfirmationData', SamlConstants::NS_ASSERTION, $parent, $context); $this->attributesToXml( - array('InResponseTo', 'NotBefore', 'NotOnOrAfter', 'Address', 'Recipient'), + ['InResponseTo', 'NotBefore', 'NotOnOrAfter', 'Address', 'Recipient'], $result ); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'SubjectConfirmationData', SamlConstants::NS_ASSERTION); - $this->attributesFromXml($node, array( + $this->attributesFromXml($node, [ 'InResponseTo', 'NotBefore', 'NotOnOrAfter', 'Address', 'Recipient', - )); + ]); } } diff --git a/src/LightSaml/Model/Assertion/SubjectLocality.php b/src/LightSaml/Model/Assertion/SubjectLocality.php index c9d05636..c102dab0 100644 --- a/src/LightSaml/Model/Assertion/SubjectLocality.php +++ b/src/LightSaml/Model/Assertion/SubjectLocality.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Assertion; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class SubjectLocality extends AbstractSamlModel @@ -69,26 +69,19 @@ public function getDNSName() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('SubjectLocality', SamlConstants::NS_ASSERTION, $parent, $context); - $this->attributesToXml(array('Address', 'DNSName'), $result); + $this->attributesToXml(['Address', 'DNSName'], $result); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'SubjectLocality', SamlConstants::NS_ASSERTION); - $this->attributesFromXml($node, array('Address', 'DNSName')); + $this->attributesFromXml($node, ['Address', 'DNSName']); } } diff --git a/src/LightSaml/Model/Context/DeserializationContext.php b/src/LightSaml/Model/Context/DeserializationContext.php index 9c0fddc4..b5011d06 100644 --- a/src/LightSaml/Model/Context/DeserializationContext.php +++ b/src/LightSaml/Model/Context/DeserializationContext.php @@ -39,8 +39,6 @@ public function getDocument() } /** - * @param \DOMDocument $document - * * @return DeserializationContext */ public function setDocument(\DOMDocument $document) diff --git a/src/LightSaml/Model/Context/SerializationContext.php b/src/LightSaml/Model/Context/SerializationContext.php index e26bf79a..1d796592 100644 --- a/src/LightSaml/Model/Context/SerializationContext.php +++ b/src/LightSaml/Model/Context/SerializationContext.php @@ -24,9 +24,6 @@ public function __construct(\DOMDocument $document = null) $this->document = $document ? $document : new \DOMDocument(); } - /** - * @param \DOMDocument $document - */ public function setDocument(\DOMDocument $document) { $this->document = $document; diff --git a/src/LightSaml/Model/Metadata/AssertionConsumerService.php b/src/LightSaml/Model/Metadata/AssertionConsumerService.php index bbfc3a71..70669faa 100644 --- a/src/LightSaml/Model/Metadata/AssertionConsumerService.php +++ b/src/LightSaml/Model/Metadata/AssertionConsumerService.php @@ -23,10 +23,6 @@ public function serialize(\DOMNode $parent, SerializationContext $context) parent::serialize($result, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'AssertionConsumerService', SamlConstants::NS_METADATA); diff --git a/src/LightSaml/Model/Metadata/ContactPerson.php b/src/LightSaml/Model/Metadata/ContactPerson.php index 9d0a61d2..51d97ca4 100644 --- a/src/LightSaml/Model/Metadata/ContactPerson.php +++ b/src/LightSaml/Model/Metadata/ContactPerson.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Metadata; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class ContactPerson extends AbstractSamlModel @@ -63,7 +63,7 @@ public function getContactType() } /** - * @param null|string $company + * @param string|null $company * * @return ContactPerson */ @@ -75,7 +75,7 @@ public function setCompany($company) } /** - * @return null|string + * @return string|null */ public function getCompany() { @@ -83,7 +83,7 @@ public function getCompany() } /** - * @param null|string $emailAddress + * @param string|null $emailAddress * * @return ContactPerson */ @@ -95,7 +95,7 @@ public function setEmailAddress($emailAddress) } /** - * @return null|string + * @return string|null */ public function getEmailAddress() { @@ -103,7 +103,7 @@ public function getEmailAddress() } /** - * @param null|string $givenName + * @param string|null $givenName * * @return ContactPerson */ @@ -115,7 +115,7 @@ public function setGivenName($givenName) } /** - * @return null|string + * @return string|null */ public function getGivenName() { @@ -123,7 +123,7 @@ public function getGivenName() } /** - * @param null|string $surName + * @param string|null $surName * * @return ContactPerson */ @@ -135,7 +135,7 @@ public function setSurName($surName) } /** - * @return null|string + * @return string|null */ public function getSurName() { @@ -143,7 +143,7 @@ public function getSurName() } /** - * @param null|string $telephoneNumber + * @param string|null $telephoneNumber * * @return ContactPerson */ @@ -155,7 +155,7 @@ public function setTelephoneNumber($telephoneNumber) } /** - * @return null|string + * @return string|null */ public function getTelephoneNumber() { @@ -163,41 +163,34 @@ public function getTelephoneNumber() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('ContactPerson', SamlConstants::NS_METADATA, $parent, $context); - $this->attributesToXml(array('contactType'), $result); + $this->attributesToXml(['contactType'], $result); $this->singleElementsToXml( - array('Company', 'GivenName', 'SurName', 'EmailAddress', 'TelephoneNumber'), + ['Company', 'GivenName', 'SurName', 'EmailAddress', 'TelephoneNumber'], $result, $context, SamlConstants::NS_METADATA ); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'ContactPerson', SamlConstants::NS_METADATA); - $this->attributesFromXml($node, array('contactType')); + $this->attributesFromXml($node, ['contactType']); - $this->singleElementsFromXml($node, $context, array( - 'Company' => array('md', null), - 'GivenName' => array('md', null), - 'SurName' => array('md', null), - 'EmailAddress' => array('md', null), - 'TelephoneNumber' => array('md', null), - )); + $this->singleElementsFromXml($node, $context, [ + 'Company' => ['md', null], + 'GivenName' => ['md', null], + 'SurName' => ['md', null], + 'EmailAddress' => ['md', null], + 'TelephoneNumber' => ['md', null], + ]); } } diff --git a/src/LightSaml/Model/Metadata/Endpoint.php b/src/LightSaml/Model/Metadata/Endpoint.php index ec3f157a..ae3fa48c 100644 --- a/src/LightSaml/Model/Metadata/Endpoint.php +++ b/src/LightSaml/Model/Metadata/Endpoint.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Metadata; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; abstract class Endpoint extends AbstractSamlModel { @@ -77,7 +77,7 @@ public function getLocation() } /** - * @param null|string $responseLocation + * @param string|null $responseLocation * * @return Endpoint */ @@ -89,28 +89,20 @@ public function setResponseLocation($responseLocation) } /** - * @return null|string + * @return string|null */ public function getResponseLocation() { return $this->responseLocation; } - /** - * @param \DOMNode $parent - * @param SerializationContext $context - */ public function serialize(\DOMNode $parent, SerializationContext $context) { - $this->attributesToXml(array('Binding', 'Location', 'ResponseLocation'), $parent); + $this->attributesToXml(['Binding', 'Location', 'ResponseLocation'], $parent); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { - $this->attributesFromXml($node, array('Binding', 'Location', 'ResponseLocation')); + $this->attributesFromXml($node, ['Binding', 'Location', 'ResponseLocation']); } } diff --git a/src/LightSaml/Model/Metadata/EndpointReference.php b/src/LightSaml/Model/Metadata/EndpointReference.php index 6378a6f0..c2db450d 100644 --- a/src/LightSaml/Model/Metadata/EndpointReference.php +++ b/src/LightSaml/Model/Metadata/EndpointReference.php @@ -22,11 +22,6 @@ class EndpointReference /** @var Endpoint */ protected $endpoint; - /** - * @param EntityDescriptor $entityDescriptor - * @param RoleDescriptor $descriptor - * @param Endpoint $endpoint - */ public function __construct(EntityDescriptor $entityDescriptor, RoleDescriptor $descriptor, Endpoint $endpoint) { $this->entityDescriptor = $entityDescriptor; diff --git a/src/LightSaml/Model/Metadata/EntitiesDescriptor.php b/src/LightSaml/Model/Metadata/EntitiesDescriptor.php index 88dfa21b..9f04480d 100644 --- a/src/LightSaml/Model/Metadata/EntitiesDescriptor.php +++ b/src/LightSaml/Model/Metadata/EntitiesDescriptor.php @@ -35,7 +35,7 @@ class EntitiesDescriptor extends Metadata protected $signature; /** @var EntitiesDescriptor[]|EntityDescriptor[] */ - protected $items = array(); + protected $items = []; /** * @param string $filename @@ -127,8 +127,6 @@ public function getName() } /** - * @param \LightSaml\Model\XmlDSig\Signature $signature - * * @return EntitiesDescriptor */ public function setSignature(Signature $signature) @@ -260,7 +258,7 @@ public function getAllItems() */ public function getAllEntityDescriptors() { - $result = array(); + $result = []; foreach ($this->items as $item) { if ($item instanceof self) { $result = array_merge($result, $item->getAllEntityDescriptors()); @@ -289,35 +287,28 @@ public function getByEntityId($entityId) } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('EntitiesDescriptor', SamlConstants::NS_METADATA, $parent, $context); - $this->attributesToXml(array('validUntil', 'cacheDuration', 'ID', 'Name'), $result); + $this->attributesToXml(['validUntil', 'cacheDuration', 'ID', 'Name'], $result); - $this->singleElementsToXml(array('Signature'), $result, $context); + $this->singleElementsToXml(['Signature'], $result, $context); $this->manyElementsToXml($this->getAllItems(), $result, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'EntitiesDescriptor', SamlConstants::NS_METADATA); - $this->attributesFromXml($node, array('validUntil', 'cacheDuration', 'ID', 'Name')); + $this->attributesFromXml($node, ['validUntil', 'cacheDuration', 'ID', 'Name']); - $this->singleElementsFromXml($node, $context, array( - 'Signature' => array('ds', 'LightSaml\Model\XmlDSig\SignatureXmlReader'), - )); + $this->singleElementsFromXml($node, $context, [ + 'Signature' => ['ds', 'LightSaml\Model\XmlDSig\SignatureXmlReader'], + ]); $this->manyElementsFromXml( $node, diff --git a/src/LightSaml/Model/Metadata/EntityDescriptor.php b/src/LightSaml/Model/Metadata/EntityDescriptor.php index 517d52f4..1a60493b 100644 --- a/src/LightSaml/Model/Metadata/EntityDescriptor.php +++ b/src/LightSaml/Model/Metadata/EntityDescriptor.php @@ -70,23 +70,20 @@ public static function loadXml($xml) /** * @param string|null $entityId - * @param array $items */ - public function __construct($entityId = null, array $items = array()) + public function __construct($entityId = null, array $items = []) { $this->entityID = $entityId; $this->items = $items; } /** - * @param ContactPerson $contactPerson - * * @return EntityDescriptor */ public function addContactPerson(ContactPerson $contactPerson) { if (false == is_array($this->contactPersons)) { - $this->contactPersons = array(); + $this->contactPersons = []; } $this->contactPersons[] = $contactPerson; @@ -121,7 +118,7 @@ public function getFirstContactPerson() public function addOrganization(Organization $organization) { if (false == is_array($this->organizations)) { - $this->organizations = array(); + $this->organizations = []; } $this->organizations[] = $organization; @@ -228,7 +225,7 @@ public function addItem($item) } if (false == is_array($this->items)) { - $this->items = array(); + $this->items = []; } $this->items[] = $item; @@ -249,7 +246,7 @@ public function getAllItems() */ public function getAllIdpSsoDescriptors() { - $result = array(); + $result = []; foreach ($this->getAllItems() as $item) { if ($item instanceof IdpSsoDescriptor) { $result[] = $item; @@ -264,7 +261,7 @@ public function getAllIdpSsoDescriptors() */ public function getAllSpSsoDescriptors() { - $result = array(); + $result = []; foreach ($this->getAllItems() as $item) { if ($item instanceof SpSsoDescriptor) { $result[] = $item; @@ -371,7 +368,7 @@ public function getValidUntilDateTime() */ public function getAllIdpKeyDescriptors() { - $result = array(); + $result = []; foreach ($this->getAllIdpSsoDescriptors() as $idp) { foreach ($idp->getAllKeyDescriptors() as $key) { $result[] = $key; @@ -386,7 +383,7 @@ public function getAllIdpKeyDescriptors() */ public function getAllSpKeyDescriptors() { - $result = array(); + $result = []; foreach ($this->getAllSpSsoDescriptors() as $sp) { foreach ($sp->getAllKeyDescriptors() as $key) { $result[] = $key; @@ -401,7 +398,7 @@ public function getAllSpKeyDescriptors() */ public function getAllEndpoints() { - $result = array(); + $result = []; foreach ($this->getAllIdpSsoDescriptors() as $idpSsoDescriptor) { foreach ($idpSsoDescriptor->getAllSingleSignOnServices() as $sso) { $result[] = new EndpointReference($this, $idpSsoDescriptor, $sso); @@ -423,16 +420,13 @@ public function getAllEndpoints() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('EntityDescriptor', SamlConstants::NS_METADATA, $parent, $context); - $this->attributesToXml(array('entityID', 'validUntil', 'cacheDuration', 'ID'), $result); + $this->attributesToXml(['entityID', 'validUntil', 'cacheDuration', 'ID'], $result); $this->manyElementsToXml($this->getAllItems(), $result, $context, null); if ($this->organizations) { @@ -442,20 +436,16 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $this->manyElementsToXml($this->contactPersons, $result, $context, null); } - $this->singleElementsToXml(array('Signature'), $result, $context); + $this->singleElementsToXml(['Signature'], $result, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'EntityDescriptor', SamlConstants::NS_METADATA); - $this->attributesFromXml($node, array('entityID', 'validUntil', 'cacheDuration', 'ID')); + $this->attributesFromXml($node, ['entityID', 'validUntil', 'cacheDuration', 'ID']); - $this->items = array(); + $this->items = []; $this->manyElementsFromXml( $node, @@ -493,8 +483,8 @@ public function deserialize(\DOMNode $node, DeserializationContext $context) 'addContactPerson' ); - $this->singleElementsFromXml($node, $context, array( - 'Signature' => array('ds', 'LightSaml\Model\XmlDSig\SignatureXmlReader'), - )); + $this->singleElementsFromXml($node, $context, [ + 'Signature' => ['ds', 'LightSaml\Model\XmlDSig\SignatureXmlReader'], + ]); } } diff --git a/src/LightSaml/Model/Metadata/IdpSsoDescriptor.php b/src/LightSaml/Model/Metadata/IdpSsoDescriptor.php index 27d7c4e9..730cc939 100644 --- a/src/LightSaml/Model/Metadata/IdpSsoDescriptor.php +++ b/src/LightSaml/Model/Metadata/IdpSsoDescriptor.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Metadata; +use LightSaml\Model\Assertion\Attribute; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\Assertion\Attribute; use LightSaml\SamlConstants; class IdpSsoDescriptor extends SSODescriptor @@ -48,14 +48,12 @@ public function getWantAuthnRequestsSigned() } /** - * @param SingleSignOnService $singleSignOnService - * * @return IdpSsoDescriptor */ public function addSingleSignOnService(SingleSignOnService $singleSignOnService) { if (false == is_array($this->singleSignOnServices)) { - $this->singleSignOnServices = array(); + $this->singleSignOnServices = []; } $this->singleSignOnServices[] = $singleSignOnService; @@ -77,7 +75,7 @@ public function getAllSingleSignOnServices() */ public function getAllSingleSignOnServicesByUrl($url) { - $result = array(); + $result = []; foreach ($this->getAllSingleSignOnServices() as $svc) { if ($svc->getLocation() == $url) { $result[] = $svc; @@ -94,7 +92,7 @@ public function getAllSingleSignOnServicesByUrl($url) */ public function getAllSingleSignOnServicesByBinding($binding) { - $result = array(); + $result = []; foreach ($this->getAllSingleSignOnServices() as $svc) { if ($svc->getBinding() == $binding) { $result[] = $svc; @@ -121,14 +119,12 @@ public function getFirstSingleSignOnService($binding = null) } /** - * @param \LightSaml\Model\Assertion\Attribute $attribute - * * @return IdpSsoDescriptor */ public function addAttribute(Attribute $attribute) { if (false == is_array($this->attributes)) { - $this->attributes = array(); + $this->attributes = []; } $this->attributes[] = $attribute; @@ -143,17 +139,13 @@ public function getAllAttributes() return $this->attributes; } - /** - * @param \DOMNode $parent - * @param SerializationContext $context - */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('IDPSSODescriptor', SamlConstants::NS_METADATA, $parent, $context); parent::serialize($result, $context); - $this->attributesToXml(array('WantAuthnRequestsSigned'), $result); + $this->attributesToXml(['WantAuthnRequestsSigned'], $result); if ($this->getAllSingleSignOnServices()) { foreach ($this->getAllSingleSignOnServices() as $object) { @@ -167,19 +159,15 @@ public function serialize(\DOMNode $parent, SerializationContext $context) } } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'IDPSSODescriptor', SamlConstants::NS_METADATA); parent::deserialize($node, $context); - $this->attributesFromXml($node, array('WantAuthnRequestsSigned')); + $this->attributesFromXml($node, ['WantAuthnRequestsSigned']); - $this->singleSignOnServices = array(); + $this->singleSignOnServices = []; $this->manyElementsFromXml( $node, $context, @@ -189,7 +177,7 @@ public function deserialize(\DOMNode $node, DeserializationContext $context) 'addSingleSignOnService' ); - $this->attributes = array(); + $this->attributes = []; $this->manyElementsFromXml( $node, $context, diff --git a/src/LightSaml/Model/Metadata/IndexedEndpoint.php b/src/LightSaml/Model/Metadata/IndexedEndpoint.php index f592117b..a017e1ed 100644 --- a/src/LightSaml/Model/Metadata/IndexedEndpoint.php +++ b/src/LightSaml/Model/Metadata/IndexedEndpoint.php @@ -70,23 +70,15 @@ public function getIndex() return $this->index; } - /** - * @param \DOMNode $parent - * @param SerializationContext $context - */ public function serialize(\DOMNode $parent, SerializationContext $context) { - $this->attributesToXml(array('index', 'isDefault'), $parent); + $this->attributesToXml(['index', 'isDefault'], $parent); parent::serialize($parent, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { - $this->attributesFromXml($node, array('index', 'isDefault')); + $this->attributesFromXml($node, ['index', 'isDefault']); parent::deserialize($node, $context); } diff --git a/src/LightSaml/Model/Metadata/KeyDescriptor.php b/src/LightSaml/Model/Metadata/KeyDescriptor.php index 5491f130..38257578 100644 --- a/src/LightSaml/Model/Metadata/KeyDescriptor.php +++ b/src/LightSaml/Model/Metadata/KeyDescriptor.php @@ -11,12 +11,12 @@ namespace LightSaml\Model\Metadata; +use LightSaml\Credential\X509Certificate; use LightSaml\Error\LightSamlXmlException; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; -use LightSaml\Credential\X509Certificate; class KeyDescriptor extends AbstractSamlModel { @@ -30,8 +30,7 @@ class KeyDescriptor extends AbstractSamlModel private $certificate; /** - * @param string|null $use - * @param X509Certificate|null $certificate + * @param string|null $use */ public function __construct($use = null, X509Certificate $certificate = null) { @@ -66,8 +65,6 @@ public function getUse() } /** - * @param X509Certificate $certificate - * * @return KeyDescriptor */ public function setCertificate(X509Certificate $certificate) @@ -86,16 +83,13 @@ public function getCertificate() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('KeyDescriptor', SamlConstants::NS_METADATA, $parent, $context); - $this->attributesToXml(array('use'), $result); + $this->attributesToXml(['use'], $result); $keyInfo = $this->createElement('ds:KeyInfo', SamlConstants::NS_XMLDSIG, $result, $context); $xData = $this->createElement('ds:X509Data', SamlConstants::NS_XMLDSIG, $keyInfo, $context); @@ -104,15 +98,11 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $xCert->nodeValue = $this->getCertificate()->getData(); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'KeyDescriptor', SamlConstants::NS_METADATA); - $this->attributesFromXml($node, array('use')); + $this->attributesFromXml($node, ['use']); $list = $context->getXpath()->query('./ds:KeyInfo/ds:X509Data/ds:X509Certificate', $node); if (1 != $list->length) { diff --git a/src/LightSaml/Model/Metadata/Metadata.php b/src/LightSaml/Model/Metadata/Metadata.php index d60fb141..e94ec5a6 100644 --- a/src/LightSaml/Model/Metadata/Metadata.php +++ b/src/LightSaml/Model/Metadata/Metadata.php @@ -33,8 +33,7 @@ public static function fromFile($path) } /** - * @param string $xml - * @param DeserializationContext $context + * @param string $xml * * @return EntityDescriptor|EntitiesDescriptor * @@ -57,17 +56,13 @@ public static function fromXML($xml, DeserializationContext $context) } if (SamlConstants::NS_METADATA !== $node->namespaceURI) { - throw new LightSamlXmlException(sprintf( - "Invalid namespace '%s' of the root XML element, expected '%s'", - $node->namespaceURI, - SamlConstants::NS_METADATA - )); + throw new LightSamlXmlException(sprintf("Invalid namespace '%s' of the root XML element, expected '%s'", $node->namespaceURI, SamlConstants::NS_METADATA)); } - $map = array( + $map = [ 'EntityDescriptor' => '\LightSaml\Model\Metadata\EntityDescriptor', 'EntitiesDescriptor' => '\LightSaml\Model\Metadata\EntitiesDescriptor', - ); + ]; $rootElementName = $node->localName; diff --git a/src/LightSaml/Model/Metadata/Organization.php b/src/LightSaml/Model/Metadata/Organization.php index 1c377ab7..5e3a4477 100644 --- a/src/LightSaml/Model/Metadata/Organization.php +++ b/src/LightSaml/Model/Metadata/Organization.php @@ -12,9 +12,9 @@ namespace LightSaml\Model\Metadata; use LightSaml\Error\LightSamlXmlException; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class Organization extends AbstractSamlModel @@ -111,9 +111,6 @@ public function getOrganizationURL() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -124,7 +121,7 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $result = $this->createElement('Organization', SamlConstants::NS_METADATA, $parent, $context); - $elements = array('OrganizationName', 'OrganizationDisplayName', 'OrganizationURL'); + $elements = ['OrganizationName', 'OrganizationDisplayName', 'OrganizationURL']; $this->singleElementsToXml( $elements, $result, @@ -142,18 +139,14 @@ public function serialize(\DOMNode $parent, SerializationContext $context) } } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'Organization', SamlConstants::NS_METADATA); - $this->singleElementsFromXml($node, $context, array( - 'OrganizationName' => array('md', null), - 'OrganizationDisplayName' => array('md', null), - 'OrganizationURL' => array('md', null), - )); + $this->singleElementsFromXml($node, $context, [ + 'OrganizationName' => ['md', null], + 'OrganizationDisplayName' => ['md', null], + 'OrganizationURL' => ['md', null], + ]); } } diff --git a/src/LightSaml/Model/Metadata/RoleDescriptor.php b/src/LightSaml/Model/Metadata/RoleDescriptor.php index 0fd6c8ba..d2543437 100644 --- a/src/LightSaml/Model/Metadata/RoleDescriptor.php +++ b/src/LightSaml/Model/Metadata/RoleDescriptor.php @@ -12,9 +12,9 @@ namespace LightSaml\Model\Metadata; use LightSaml\Helper; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\XmlDSig\Signature; use LightSaml\SamlConstants; @@ -48,7 +48,7 @@ abstract class RoleDescriptor extends AbstractSamlModel protected $contactPersons; /** - * @param null|string $cacheDuration + * @param string|null $cacheDuration * * @throws \InvalidArgumentException * @@ -64,7 +64,7 @@ public function setCacheDuration($cacheDuration) } /** - * @return null|string + * @return string|null */ public function getCacheDuration() { @@ -72,14 +72,12 @@ public function getCacheDuration() } /** - * @param ContactPerson $contactPerson - * * @return RoleDescriptor */ public function addContactPerson(ContactPerson $contactPerson) { if (false == is_array($this->contactPersons)) { - $this->contactPersons = array(); + $this->contactPersons = []; } $this->contactPersons[] = $contactPerson; @@ -95,7 +93,7 @@ public function getAllContactPersons() } /** - * @param null|string $errorURL + * @param string|null $errorURL * * @return RoleDescriptor */ @@ -107,7 +105,7 @@ public function setErrorURL($errorURL) } /** - * @return null|string + * @return string|null */ public function getErrorURL() { @@ -115,7 +113,7 @@ public function getErrorURL() } /** - * @param null|string $id + * @param string|null $id * * @return RoleDescriptor */ @@ -127,7 +125,7 @@ public function setID($id) } /** - * @return null|string + * @return string|null */ public function getID() { @@ -135,14 +133,12 @@ public function getID() } /** - * @param KeyDescriptor $keyDescriptor - * * @return RoleDescriptor */ public function addKeyDescriptor(KeyDescriptor $keyDescriptor) { if (false == is_array($this->keyDescriptors)) { - $this->keyDescriptors = array(); + $this->keyDescriptors = []; } $this->keyDescriptors[] = $keyDescriptor; @@ -164,7 +160,7 @@ public function getAllKeyDescriptors() */ public function getAllKeyDescriptorsByUse($use) { - $result = array(); + $result = []; foreach ($this->getAllKeyDescriptors() as $kd) { if ($kd->getUse() == $use) { $result[] = $kd; @@ -193,14 +189,12 @@ public function getFirstKeyDescriptor($use = null) } /** - * @param Organization $organization - * * @return RoleDescriptor */ public function addOrganization(Organization $organization) { if (false == is_array($this->organizations)) { - $this->organizations = array(); + $this->organizations = []; } $this->organizations[] = $organization; @@ -236,14 +230,12 @@ public function getProtocolSupportEnumeration() } /** - * @param \LightSaml\Model\XmlDSig\Signature $signature - * * @return RoleDescriptor */ public function addSignature(Signature $signature) { if (false == is_array($this->signatures)) { - $this->signatures = array(); + $this->signatures = []; } $this->signatures[] = $signature; @@ -303,15 +295,12 @@ public function getValidUntilDateTime() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $this->attributesToXml( - array('protocolSupportEnumeration', 'ID', 'validUntil', 'cacheDuration', 'errorURL'), + ['protocolSupportEnumeration', 'ID', 'validUntil', 'cacheDuration', 'errorURL'], $parent ); @@ -321,15 +310,11 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $this->manyElementsToXml($this->getAllContactPersons(), $parent, $context, null); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->attributesFromXml( $node, - array('protocolSupportEnumeration', 'ID', 'validUntil', 'cacheDuration', 'errorURL') + ['protocolSupportEnumeration', 'ID', 'validUntil', 'cacheDuration', 'errorURL'] ); $this->manyElementsFromXml( diff --git a/src/LightSaml/Model/Metadata/SSODescriptor.php b/src/LightSaml/Model/Metadata/SSODescriptor.php index da9715cd..d32707ad 100644 --- a/src/LightSaml/Model/Metadata/SSODescriptor.php +++ b/src/LightSaml/Model/Metadata/SSODescriptor.php @@ -18,14 +18,12 @@ abstract class SSODescriptor extends RoleDescriptor { /** @var SingleLogoutService[] */ - protected $singleLogoutServices = array(); + protected $singleLogoutServices = []; /** @var string[]|null */ protected $nameIDFormats; /** - * @param SingleLogoutService $singleLogoutService - * * @return SSODescriptor */ public function addSingleLogoutService(SingleLogoutService $singleLogoutService) @@ -50,7 +48,7 @@ public function getAllSingleLogoutServices() */ public function getAllSingleLogoutServicesByBinding($binding) { - $result = array(); + $result = []; foreach ($this->getAllSingleLogoutServices() as $svc) { if ($binding == $svc->getBinding()) { $result[] = $svc; @@ -89,7 +87,7 @@ public function addNameIDFormat($nameIDFormat) } /** - * @return null|string[] + * @return string[]|null */ public function getAllNameIDFormats() { @@ -114,10 +112,6 @@ public function hasNameIDFormat($nameIdFormat) return false; } - /** - * @param \DOMNode $parent - * @param SerializationContext $context - */ public function serialize(\DOMNode $parent, SerializationContext $context) { parent::serialize($parent, $context); @@ -126,10 +120,6 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $this->manyElementsToXml($this->getAllNameIDFormats(), $parent, $context, 'NameIDFormat', SamlConstants::NS_METADATA); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { parent::deserialize($node, $context); diff --git a/src/LightSaml/Model/Metadata/SingleLogoutService.php b/src/LightSaml/Model/Metadata/SingleLogoutService.php index 7132de9e..d1fe5180 100644 --- a/src/LightSaml/Model/Metadata/SingleLogoutService.php +++ b/src/LightSaml/Model/Metadata/SingleLogoutService.php @@ -23,10 +23,6 @@ public function serialize(\DOMNode $parent, SerializationContext $context) parent::serialize($result, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'SingleLogoutService', SamlConstants::NS_METADATA); diff --git a/src/LightSaml/Model/Metadata/SpSsoDescriptor.php b/src/LightSaml/Model/Metadata/SpSsoDescriptor.php index eb87aa1d..8f2f4731 100644 --- a/src/LightSaml/Model/Metadata/SpSsoDescriptor.php +++ b/src/LightSaml/Model/Metadata/SpSsoDescriptor.php @@ -27,14 +27,12 @@ class SpSsoDescriptor extends SSODescriptor protected $assertionConsumerServices; /** - * @param AssertionConsumerService $assertionConsumerService - * * @return SpSsoDescriptor */ public function addAssertionConsumerService(AssertionConsumerService $assertionConsumerService) { if (false == is_array($this->assertionConsumerServices)) { - $this->assertionConsumerServices = array(); + $this->assertionConsumerServices = []; } if (null === $assertionConsumerService->getIndex()) { $assertionConsumerService->setIndex(count($this->assertionConsumerServices)); @@ -59,7 +57,7 @@ public function getAllAssertionConsumerServices() */ public function getAllAssertionConsumerServicesByBinding($binding) { - $result = array(); + $result = []; foreach ($this->getAllAssertionConsumerServices() as $svc) { if ($svc->getBinding() == $binding) { $result[] = $svc; @@ -76,7 +74,7 @@ public function getAllAssertionConsumerServicesByBinding($binding) */ public function getAllAssertionConsumerServicesByUrl($url) { - $result = array(); + $result = []; foreach ($this->getAllAssertionConsumerServices() as $svc) { if ($svc->getLocation() == $url) { $result[] = $svc; @@ -158,32 +156,24 @@ public function getWantAssertionsSigned() return $this->wantAssertionsSigned; } - /** - * @param \DOMNode $parent - * @param SerializationContext $context - */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('SPSSODescriptor', SamlConstants::NS_METADATA, $parent, $context); parent::serialize($result, $context); - $this->attributesToXml(array('AuthnRequestsSigned', 'WantAssertionsSigned'), $result); + $this->attributesToXml(['AuthnRequestsSigned', 'WantAssertionsSigned'], $result); $this->manyElementsToXml($this->getAllAssertionConsumerServices(), $result, $context, null); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'SPSSODescriptor', SamlConstants::NS_METADATA); parent::deserialize($node, $context); - $this->attributesFromXml($node, array('AuthnRequestsSigned', 'WantAssertionsSigned')); + $this->attributesFromXml($node, ['AuthnRequestsSigned', 'WantAssertionsSigned']); $this->manyElementsFromXml( $node, diff --git a/src/LightSaml/Model/Protocol/AuthnRequest.php b/src/LightSaml/Model/Protocol/AuthnRequest.php index 722c1783..5dcc63c9 100644 --- a/src/LightSaml/Model/Protocol/AuthnRequest.php +++ b/src/LightSaml/Model/Protocol/AuthnRequest.php @@ -11,10 +11,10 @@ namespace LightSaml\Model\Protocol; -use LightSaml\Model\Context\DeserializationContext; -use LightSaml\Model\Context\SerializationContext; use LightSaml\Model\Assertion\Conditions; use LightSaml\Model\Assertion\Subject; +use LightSaml\Model\Context\DeserializationContext; +use LightSaml\Model\Context\SerializationContext; use LightSaml\SamlConstants; class AuthnRequest extends AbstractRequest @@ -76,7 +76,7 @@ public function getSubject() } /** - * @param null|string $providerName + * @param string|null $providerName * * @return AuthnRequest */ @@ -88,7 +88,7 @@ public function setProviderName($providerName) } /** - * @return null|string + * @return string|null */ public function getProviderName() { @@ -96,7 +96,7 @@ public function getProviderName() } /** - * @param null|string $protocolBinding + * @param string|null $protocolBinding * * @return AuthnRequest */ @@ -108,7 +108,7 @@ public function setProtocolBinding($protocolBinding) } /** - * @return null|string + * @return string|null */ public function getProtocolBinding() { @@ -220,7 +220,7 @@ public function getConditions() } /** - * @param null|int $attributeConsumingServiceIndex + * @param int|null $attributeConsumingServiceIndex * * @return AuthnRequest */ @@ -234,7 +234,7 @@ public function setAttributeConsumingServiceIndex($attributeConsumingServiceInde } /** - * @return null|int + * @return int|null */ public function getAttributeConsumingServiceIndex() { @@ -242,7 +242,7 @@ public function getAttributeConsumingServiceIndex() } /** - * @param null|string $assertionConsumerServiceURL + * @param string|null $assertionConsumerServiceURL * * @return AuthnRequest */ @@ -254,7 +254,7 @@ public function setAssertionConsumerServiceURL($assertionConsumerServiceURL) } /** - * @return null|string + * @return string|null */ public function getAssertionConsumerServiceURL() { @@ -262,7 +262,7 @@ public function getAssertionConsumerServiceURL() } /** - * @param null|int $assertionConsumerServiceIndex + * @param int|null $assertionConsumerServiceIndex * * @return AuthnRequest */ @@ -276,7 +276,7 @@ public function setAssertionConsumerServiceIndex($assertionConsumerServiceIndex) } /** - * @return null|int + * @return int|null */ public function getAssertionConsumerServiceIndex() { @@ -286,9 +286,6 @@ public function getAssertionConsumerServiceIndex() //endregion /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -297,36 +294,32 @@ public function serialize(\DOMNode $parent, SerializationContext $context) parent::serialize($result, $context); - $this->attributesToXml(array( + $this->attributesToXml([ 'ForceAuthn', 'IsPassive', 'ProtocolBinding', 'AssertionConsumerServiceIndex', 'AssertionConsumerServiceURL', 'AttributeConsumingServiceIndex', 'ProviderName', - ), $result); + ], $result); - $this->singleElementsToXml(array('Subject', 'NameIDPolicy', 'Conditions'), $result, $context); + $this->singleElementsToXml(['Subject', 'NameIDPolicy', 'Conditions'], $result, $context); // must be last in order signature to include them all - $this->singleElementsToXml(array('Signature'), $result, $context); + $this->singleElementsToXml(['Signature'], $result, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'AuthnRequest', SamlConstants::NS_PROTOCOL); parent::deserialize($node, $context); - $this->attributesFromXml($node, array( + $this->attributesFromXml($node, [ 'ForceAuthn', 'IsPassive', 'ProtocolBinding', 'AssertionConsumerServiceIndex', 'AssertionConsumerServiceURL', 'AttributeConsumingServiceIndex', 'ProviderName', - )); + ]); - $this->singleElementsFromXml($node, $context, array( - 'Subject' => array('saml', 'LightSaml\Model\Assertion\Subject'), - 'NameIDPolicy' => array('samlp', 'LightSaml\Model\Protocol\NameIDPolicy'), - 'Conditions' => array('saml', 'LightSaml\Model\Assertion\Conditions'), - )); + $this->singleElementsFromXml($node, $context, [ + 'Subject' => ['saml', 'LightSaml\Model\Assertion\Subject'], + 'NameIDPolicy' => ['samlp', 'LightSaml\Model\Protocol\NameIDPolicy'], + 'Conditions' => ['saml', 'LightSaml\Model\Assertion\Conditions'], + ]); } } diff --git a/src/LightSaml/Model/Protocol/LogoutRequest.php b/src/LightSaml/Model/Protocol/LogoutRequest.php index 4d850eb3..9407a742 100644 --- a/src/LightSaml/Model/Protocol/LogoutRequest.php +++ b/src/LightSaml/Model/Protocol/LogoutRequest.php @@ -12,9 +12,9 @@ namespace LightSaml\Model\Protocol; use LightSaml\Helper; +use LightSaml\Model\Assertion\NameID; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\Assertion\NameID; use LightSaml\SamlConstants; class LogoutRequest extends AbstractRequest @@ -32,8 +32,6 @@ class LogoutRequest extends AbstractRequest protected $sessionIndex; /** - * @param NameID $nameID - * * @return LogoutRequest */ public function setNameID(NameID $nameID) @@ -96,7 +94,7 @@ public function getNotOnOrAfterDateTime() } /** - * @param null|string $reason + * @param string|null $reason * * @return LogoutRequest */ @@ -108,7 +106,7 @@ public function setReason($reason) } /** - * @return null|string + * @return string|null */ public function getReason() { @@ -116,7 +114,7 @@ public function getReason() } /** - * @param null|string $sessionIndex + * @param string|null $sessionIndex * * @return LogoutRequest */ @@ -128,46 +126,38 @@ public function setSessionIndex($sessionIndex) } /** - * @return null|string + * @return string|null */ public function getSessionIndex() { return $this->sessionIndex; } - /** - * @param \DOMNode $parent - * @param SerializationContext $context - */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('LogoutRequest', SamlConstants::NS_PROTOCOL, $parent, $context); parent::serialize($result, $context); - $this->attributesToXml(array('Reason', 'NotOnOrAfter'), $result); + $this->attributesToXml(['Reason', 'NotOnOrAfter'], $result); - $this->singleElementsToXml(array('NameID', 'SessionIndex'), $result, $context, SamlConstants::NS_PROTOCOL); + $this->singleElementsToXml(['NameID', 'SessionIndex'], $result, $context, SamlConstants::NS_PROTOCOL); // must be last in order signature to include them all - $this->singleElementsToXml(array('Signature'), $result, $context); + $this->singleElementsToXml(['Signature'], $result, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'LogoutRequest', SamlConstants::NS_PROTOCOL); parent::deserialize($node, $context); - $this->attributesFromXml($node, array('Reason', 'NotOnOrAfter')); + $this->attributesFromXml($node, ['Reason', 'NotOnOrAfter']); - $this->singleElementsFromXml($node, $context, array( - 'NameID' => array('saml', 'LightSaml\Model\Assertion\NameID'), - 'SessionIndex' => array('samlp', null), - )); + $this->singleElementsFromXml($node, $context, [ + 'NameID' => ['saml', 'LightSaml\Model\Assertion\NameID'], + 'SessionIndex' => ['samlp', null], + ]); } } diff --git a/src/LightSaml/Model/Protocol/LogoutResponse.php b/src/LightSaml/Model/Protocol/LogoutResponse.php index c029dcef..e6463496 100644 --- a/src/LightSaml/Model/Protocol/LogoutResponse.php +++ b/src/LightSaml/Model/Protocol/LogoutResponse.php @@ -17,10 +17,6 @@ class LogoutResponse extends StatusResponse { - /** - * @param \DOMNode $parent - * @param SerializationContext $context - */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('samlp:LogoutResponse', SamlConstants::NS_PROTOCOL, $parent, $context); @@ -28,13 +24,9 @@ public function serialize(\DOMNode $parent, SerializationContext $context) parent::serialize($result, $context); // must be done here at the end and not in a base class where declared in order to include signing of the elements added here - $this->singleElementsToXml(array('Signature'), $result, $context); + $this->singleElementsToXml(['Signature'], $result, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'LogoutResponse', SamlConstants::NS_PROTOCOL); diff --git a/src/LightSaml/Model/Protocol/NameIDPolicy.php b/src/LightSaml/Model/Protocol/NameIDPolicy.php index cf87b92a..94ae9147 100644 --- a/src/LightSaml/Model/Protocol/NameIDPolicy.php +++ b/src/LightSaml/Model/Protocol/NameIDPolicy.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Protocol; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class NameIDPolicy extends AbstractSamlModel @@ -122,26 +122,19 @@ public function getSPNameQualifier() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('NameIDPolicy', SamlConstants::NS_PROTOCOL, $parent, $context); - $this->attributesToXml(array('Format', 'SPNameQualifier', 'AllowCreate'), $result); + $this->attributesToXml(['Format', 'SPNameQualifier', 'AllowCreate'], $result); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'NameIDPolicy', SamlConstants::NS_PROTOCOL); - $this->attributesFromXml($node, array('Format', 'SPNameQualifier', 'AllowCreate')); + $this->attributesFromXml($node, ['Format', 'SPNameQualifier', 'AllowCreate']); } } diff --git a/src/LightSaml/Model/Protocol/Response.php b/src/LightSaml/Model/Protocol/Response.php index 1c9b5533..13d38bc8 100644 --- a/src/LightSaml/Model/Protocol/Response.php +++ b/src/LightSaml/Model/Protocol/Response.php @@ -11,19 +11,19 @@ namespace LightSaml\Model\Protocol; -use LightSaml\Model\Context\DeserializationContext; -use LightSaml\Model\Context\SerializationContext; use LightSaml\Model\Assertion\Assertion; use LightSaml\Model\Assertion\EncryptedElement; +use LightSaml\Model\Context\DeserializationContext; +use LightSaml\Model\Context\SerializationContext; use LightSaml\SamlConstants; class Response extends StatusResponse { /** @var Assertion[] */ - protected $assertions = array(); + protected $assertions = []; /** @var EncryptedElement[] */ - protected $encryptedAssertions = array(); + protected $encryptedAssertions = []; /** * @return Assertion[] @@ -73,7 +73,7 @@ public function getFirstEncryptedAssertion() */ public function getBearerAssertions() { - $result = array(); + $result = []; if ($this->getAllAssertions()) { foreach ($this->getAllAssertions() as $assertion) { if ($assertion->hasBearerSubject()) { @@ -86,8 +86,6 @@ public function getBearerAssertions() } /** - * @param Assertion $assertion - * * @return Response */ public function addAssertion(Assertion $assertion) @@ -98,13 +96,11 @@ public function addAssertion(Assertion $assertion) } /** - * @param Assertion $removedAssertion - * * @return Response */ public function removeAssertion(Assertion $removedAssertion) { - $arr = array(); + $arr = []; $hasThatAssertion = false; foreach ($this->getAllAssertions() as $assertion) { if ($assertion !== $removedAssertion) { @@ -122,8 +118,6 @@ public function removeAssertion(Assertion $removedAssertion) } /** - * @param EncryptedElement $encryptedAssertion - * * @return Response */ public function addEncryptedAssertion(EncryptedElement $encryptedAssertion) @@ -133,10 +127,6 @@ public function addEncryptedAssertion(EncryptedElement $encryptedAssertion) return $this; } - /** - * @param \DOMNode $parent - * @param SerializationContext $context - */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('samlp:Response', SamlConstants::NS_PROTOCOL, $parent, $context); @@ -147,20 +137,16 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $this->manyElementsToXml($this->getAllEncryptedAssertions(), $result, $context, null); // must be done here at the end and not in a base class where declared in order to include signing of the elements added here - $this->singleElementsToXml(array('Signature'), $result, $context); + $this->singleElementsToXml(['Signature'], $result, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'Response', SamlConstants::NS_PROTOCOL); parent::deserialize($node, $context); - $this->assertions = array(); + $this->assertions = []; $this->manyElementsFromXml( $node, $context, @@ -170,7 +156,7 @@ public function deserialize(\DOMNode $node, DeserializationContext $context) 'addAssertion' ); - $this->encryptedAssertions = array(); + $this->encryptedAssertions = []; $this->manyElementsFromXml( $node, $context, diff --git a/src/LightSaml/Model/Protocol/SamlMessage.php b/src/LightSaml/Model/Protocol/SamlMessage.php index 50573d19..58d3823d 100644 --- a/src/LightSaml/Model/Protocol/SamlMessage.php +++ b/src/LightSaml/Model/Protocol/SamlMessage.php @@ -12,11 +12,11 @@ namespace LightSaml\Model\Protocol; use LightSaml\Error\LightSamlXmlException; -use LightSaml\Model\Context\DeserializationContext; -use LightSaml\Model\Context\SerializationContext; use LightSaml\Helper; use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Assertion\Issuer; +use LightSaml\Model\Context\DeserializationContext; +use LightSaml\Model\Context\SerializationContext; use LightSaml\Model\SamlElementInterface; use LightSaml\Model\XmlDSig\Signature; use LightSaml\SamlConstants; @@ -48,8 +48,7 @@ abstract class SamlMessage extends AbstractSamlModel protected $relayState; /** - * @param string $xml - * @param DeserializationContext $context + * @param string $xml * * @return AuthnRequest|LogoutRequest|LogoutResponse|Response|SamlMessage * @@ -72,14 +71,10 @@ public static function fromXML($xml, DeserializationContext $context) } if (SamlConstants::NS_PROTOCOL !== $node->namespaceURI) { - throw new LightSamlXmlException(sprintf( - "Invalid namespace '%s' of the root XML element, expected '%s'", - $context->getDocument()->namespaceURI, - SamlConstants::NS_PROTOCOL - )); + throw new LightSamlXmlException(sprintf("Invalid namespace '%s' of the root XML element, expected '%s'", $context->getDocument()->namespaceURI, SamlConstants::NS_PROTOCOL)); } - $map = array( + $map = [ 'AttributeQuery' => null, 'AuthnRequest' => '\LightSaml\Model\Protocol\AuthnRequest', 'LogoutResponse' => '\LightSaml\Model\Protocol\LogoutResponse', @@ -87,7 +82,7 @@ public static function fromXML($xml, DeserializationContext $context) 'Response' => '\LightSaml\Model\Protocol\Response', 'ArtifactResponse' => null, 'ArtifactResolve' => null, - ); + ]; $rootElementName = $node->localName; @@ -192,7 +187,7 @@ public function getVersion() } /** - * @param null|string $destination + * @param string|null $destination * * @return SamlMessage */ @@ -204,7 +199,7 @@ public function setDestination($destination) } /** - * @return null|string + * @return string|null */ public function getDestination() { @@ -212,8 +207,6 @@ public function getDestination() } /** - * @param Issuer|null $issuer - * * @return SamlMessage */ public function setIssuer(Issuer $issuer = null) @@ -232,7 +225,7 @@ public function getIssuer() } /** - * @param null|string $consent + * @param string|null $consent * * @return StatusResponse */ @@ -244,7 +237,7 @@ public function setConsent($consent) } /** - * @return null|string + * @return string|null */ public function getConsent() { @@ -252,8 +245,6 @@ public function getConsent() } /** - * @param Signature|null $signature - * * @return SamlMessage */ public function setSignature(Signature $signature = null) @@ -272,7 +263,7 @@ public function getSignature() } /** - * @param null|string $relayState + * @param string|null $relayState * * @return SamlMessage */ @@ -284,7 +275,7 @@ public function setRelayState($relayState) } /** - * @return null|string + * @return string|null */ public function getRelayState() { @@ -292,29 +283,22 @@ public function getRelayState() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { - $this->attributesToXml(array('ID', 'Version', 'IssueInstant', 'Destination', 'Consent'), $parent); + $this->attributesToXml(['ID', 'Version', 'IssueInstant', 'Destination', 'Consent'], $parent); - $this->singleElementsToXml(array('Issuer'), $parent, $context); + $this->singleElementsToXml(['Issuer'], $parent, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { - $this->attributesFromXml($node, array('ID', 'Version', 'IssueInstant', 'Destination', 'Consent')); + $this->attributesFromXml($node, ['ID', 'Version', 'IssueInstant', 'Destination', 'Consent']); - $this->singleElementsFromXml($node, $context, array( - 'Issuer' => array('saml', 'LightSaml\Model\Assertion\Issuer'), - 'Signature' => array('ds', 'LightSaml\Model\XmlDSig\SignatureXmlReader'), - )); + $this->singleElementsFromXml($node, $context, [ + 'Issuer' => ['saml', 'LightSaml\Model\Assertion\Issuer'], + 'Signature' => ['ds', 'LightSaml\Model\XmlDSig\SignatureXmlReader'], + ]); } } diff --git a/src/LightSaml/Model/Protocol/Status.php b/src/LightSaml/Model/Protocol/Status.php index f4f897ba..5d2ca9df 100644 --- a/src/LightSaml/Model/Protocol/Status.php +++ b/src/LightSaml/Model/Protocol/Status.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Protocol; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class Status extends AbstractSamlModel @@ -25,8 +25,7 @@ class Status extends AbstractSamlModel protected $statusMessage; /** - * @param StatusCode|null $statusCode - * @param string $message + * @param string $message */ public function __construct(StatusCode $statusCode = null, $message = null) { @@ -35,8 +34,6 @@ public function __construct(StatusCode $statusCode = null, $message = null) } /** - * @param StatusCode $statusCode - * * @return Status */ public function setStatusCode(StatusCode $statusCode) @@ -92,29 +89,22 @@ public function setSuccess() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('samlp:Status', SamlConstants::NS_PROTOCOL, $parent, $context); - $this->singleElementsToXml(array('StatusCode', 'StatusMessage'), $result, $context, SamlConstants::NS_PROTOCOL); + $this->singleElementsToXml(['StatusCode', 'StatusMessage'], $result, $context, SamlConstants::NS_PROTOCOL); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'Status', SamlConstants::NS_PROTOCOL); - $this->singleElementsFromXml($node, $context, array( - 'StatusCode' => array('samlp', 'LightSaml\Model\Protocol\StatusCode'), - 'StatusMessage' => array('samlp', null), - )); + $this->singleElementsFromXml($node, $context, [ + 'StatusCode' => ['samlp', 'LightSaml\Model\Protocol\StatusCode'], + 'StatusMessage' => ['samlp', null], + ]); } } diff --git a/src/LightSaml/Model/Protocol/StatusCode.php b/src/LightSaml/Model/Protocol/StatusCode.php index 9611a3e5..7a72a01e 100644 --- a/src/LightSaml/Model/Protocol/StatusCode.php +++ b/src/LightSaml/Model/Protocol/StatusCode.php @@ -11,9 +11,9 @@ namespace LightSaml\Model\Protocol; +use LightSaml\Model\AbstractSamlModel; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; -use LightSaml\Model\AbstractSamlModel; use LightSaml\SamlConstants; class StatusCode extends AbstractSamlModel @@ -69,32 +69,25 @@ public function getStatusCode() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { $result = $this->createElement('samlp:StatusCode', SamlConstants::NS_PROTOCOL, $parent, $context); - $this->attributesToXml(array('Value'), $result); + $this->attributesToXml(['Value'], $result); - $this->singleElementsToXml(array('StatusCode'), $result, $context); + $this->singleElementsToXml(['StatusCode'], $result, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { $this->checkXmlNodeName($node, 'StatusCode', SamlConstants::NS_PROTOCOL); - $this->attributesFromXml($node, array('Value')); + $this->attributesFromXml($node, ['Value']); - $this->singleElementsFromXml($node, $context, array( - 'StatusCode' => array('samlp', 'LightSaml\Model\Protocol\StatusCode'), - )); + $this->singleElementsFromXml($node, $context, [ + 'StatusCode' => ['samlp', 'LightSaml\Model\Protocol\StatusCode'], + ]); } } diff --git a/src/LightSaml/Model/Protocol/StatusResponse.php b/src/LightSaml/Model/Protocol/StatusResponse.php index 47b3a96b..d04c0097 100644 --- a/src/LightSaml/Model/Protocol/StatusResponse.php +++ b/src/LightSaml/Model/Protocol/StatusResponse.php @@ -43,8 +43,6 @@ public function getInResponseTo() } /** - * @param Status $status - * * @return StatusResponse */ public function setStatus(Status $status) @@ -63,31 +61,24 @@ public function getStatus() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context) { parent::serialize($parent, $context); - $this->attributesToXml(array('InResponseTo'), $parent); + $this->attributesToXml(['InResponseTo'], $parent); - $this->singleElementsToXml(array('Status'), $parent, $context); + $this->singleElementsToXml(['Status'], $parent, $context); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { - $this->attributesFromXml($node, array('InResponseTo')); + $this->attributesFromXml($node, ['InResponseTo']); - $this->singleElementsFromXml($node, $context, array( - 'Status' => array('samlp', 'LightSaml\Model\Protocol\Status'), - )); + $this->singleElementsFromXml($node, $context, [ + 'Status' => ['samlp', 'LightSaml\Model\Protocol\Status'], + ]); parent::deserialize($node, $context); } diff --git a/src/LightSaml/Model/SamlElementInterface.php b/src/LightSaml/Model/SamlElementInterface.php index 3bac0ef8..f6f08817 100644 --- a/src/LightSaml/Model/SamlElementInterface.php +++ b/src/LightSaml/Model/SamlElementInterface.php @@ -17,17 +17,11 @@ interface SamlElementInterface { /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @return void */ public function serialize(\DOMNode $parent, SerializationContext $context); /** - * @param \DOMNode $node - * @param DeserializationContext $context - * * @return void */ public function deserialize(\DOMNode $node, DeserializationContext $context); diff --git a/src/LightSaml/Model/XmlDSig/AbstractSignatureReader.php b/src/LightSaml/Model/XmlDSig/AbstractSignatureReader.php index f83e372a..0a0991fe 100644 --- a/src/LightSaml/Model/XmlDSig/AbstractSignatureReader.php +++ b/src/LightSaml/Model/XmlDSig/AbstractSignatureReader.php @@ -22,8 +22,6 @@ abstract class AbstractSignatureReader extends Signature protected $key; /** - * @param XMLSecurityKey $key - * * @return bool True if validated, False if validation was not performed * * @throws \LightSaml\Error\LightSamlSecurityException If validation fails @@ -84,8 +82,6 @@ public function validateMulti(array $credentialCandidates) abstract public function getAlgorithm(); /** - * @param XMLSecurityKey $key - * * @return XMLSecurityKey */ protected function castKeyIfNecessary(XMLSecurityKey $key) diff --git a/src/LightSaml/Model/XmlDSig/SignatureStringReader.php b/src/LightSaml/Model/XmlDSig/SignatureStringReader.php index ca05e2e4..bb1a38fd 100644 --- a/src/LightSaml/Model/XmlDSig/SignatureStringReader.php +++ b/src/LightSaml/Model/XmlDSig/SignatureStringReader.php @@ -88,8 +88,6 @@ public function getSignature() } /** - * @param XMLSecurityKey $key - * * @return bool True if validated, False if validation was not performed * * @throws LightSamlSecurityException If validation fails @@ -112,9 +110,6 @@ public function validate(XMLSecurityKey $key) } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @throws \LogicException */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -122,10 +117,6 @@ public function serialize(\DOMNode $parent, SerializationContext $context) throw new \LogicException('SignatureStringReader can not be serialized'); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { throw new \LogicException('SignatureStringReader can not be deserialized'); diff --git a/src/LightSaml/Model/XmlDSig/SignatureWriter.php b/src/LightSaml/Model/XmlDSig/SignatureWriter.php index 41743349..69057707 100644 --- a/src/LightSaml/Model/XmlDSig/SignatureWriter.php +++ b/src/LightSaml/Model/XmlDSig/SignatureWriter.php @@ -11,13 +11,13 @@ namespace LightSaml\Model\XmlDSig; +use LightSaml\Credential\X509Certificate; use LightSaml\Meta\SigningOptions; use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; use LightSaml\SamlConstants; -use LightSaml\Credential\X509Certificate; -use RobRichards\XMLSecLibs\XMLSecurityKey; use RobRichards\XMLSecLibs\XMLSecurityDSig; +use RobRichards\XMLSecLibs\XMLSecurityKey; class SignatureWriter extends Signature { @@ -36,8 +36,6 @@ class SignatureWriter extends Signature protected $signingOptions; /** - * @param SigningOptions $options - * * @return SignatureWriter */ public static function create(SigningOptions $options) @@ -49,9 +47,6 @@ public static function create(SigningOptions $options) } /** - * @param X509Certificate $certificate - * @param XMLSecurityKey $xmlSecurityKey - * * @return SignatureWriter */ public static function createByKeyAndCertificate(X509Certificate $certificate, XMLSecurityKey $xmlSecurityKey) @@ -62,9 +57,7 @@ public static function createByKeyAndCertificate(X509Certificate $certificate, X } /** - * @param X509Certificate|null $certificate - * @param XMLSecurityKey|null $xmlSecurityKey - * @param string $digestAlgorithm + * @param string $digestAlgorithm */ public function __construct(X509Certificate $certificate = null, XMLSecurityKey $xmlSecurityKey = null, $digestAlgorithm = XMLSecurityDSig::SHA1) { @@ -102,8 +95,6 @@ public function getSigningOptions() } /** - * @param SigningOptions $signingOptions - * * @return SignatureWriter */ public function setSigningOptions(SigningOptions $signingOptions) @@ -134,8 +125,6 @@ public function setCanonicalMethod($canonicalMethod) } /** - * @param XMLSecurityKey $key - * * @return SignatureWriter */ public function setXmlSecurityKey(XMLSecurityKey $key) @@ -154,8 +143,6 @@ public function getXmlSecurityKey() } /** - * @param X509Certificate $certificate - * * @return SignatureWriter */ public function setCertificate(X509Certificate $certificate) @@ -173,10 +160,6 @@ public function getCertificate() return $this->certificate; } - /** - * @param \DOMNode $parent - * @param SerializationContext $context - */ public function serialize(\DOMNode $parent, SerializationContext $context) { if ($this->signingOptions && false === $this->signingOptions->isEnabled()) { @@ -188,10 +171,10 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $key = $this->getXmlSecurityKey(); $objXMLSecDSig->addReferenceList( - array($parent), + [$parent], $this->digestAlgorithm, - array(SamlConstants::XMLSEC_TRANSFORM_ALGORITHM_ENVELOPED_SIGNATURE, XMLSecurityDSig::EXC_C14N), - array('id_name' => $this->getIDName(), 'overwrite' => false) + [SamlConstants::XMLSEC_TRANSFORM_ALGORITHM_ENVELOPED_SIGNATURE, XMLSecurityDSig::EXC_C14N], + ['id_name' => $this->getIDName(), 'overwrite' => false] ); $objXMLSecDSig->sign($key); @@ -211,10 +194,6 @@ public function serialize(\DOMNode $parent, SerializationContext $context) $objXMLSecDSig->insertSignature($parent, $firstChild); } - /** - * @param \DOMNode $node - * @param DeserializationContext $context - */ public function deserialize(\DOMNode $node, DeserializationContext $context) { throw new \LogicException('SignatureWriter can not be deserialized'); diff --git a/src/LightSaml/Model/XmlDSig/SignatureXmlReader.php b/src/LightSaml/Model/XmlDSig/SignatureXmlReader.php index 86efda9f..b9604ee7 100644 --- a/src/LightSaml/Model/XmlDSig/SignatureXmlReader.php +++ b/src/LightSaml/Model/XmlDSig/SignatureXmlReader.php @@ -16,9 +16,9 @@ use LightSaml\Model\Context\DeserializationContext; use LightSaml\Model\Context\SerializationContext; use LightSaml\SamlConstants; -use RobRichards\XMLSecLibs\XMLSecurityKey; -use RobRichards\XMLSecLibs\XMLSecurityDSig; use RobRichards\XMLSecLibs\XMLSecEnc; +use RobRichards\XMLSecLibs\XMLSecurityDSig; +use RobRichards\XMLSecLibs\XMLSecurityKey; class SignatureXmlReader extends AbstractSignatureReader { @@ -26,7 +26,7 @@ class SignatureXmlReader extends AbstractSignatureReader protected $signature; /** @var string[] */ - protected $certificates = array(); + protected $certificates = []; /** * @param string $certificate @@ -44,9 +44,6 @@ public function getAllCertificates() return $this->certificates; } - /** - * @param XMLSecurityDSig $signature - */ public function setSignature(XMLSecurityDSig $signature) { $this->signature = $signature; @@ -61,8 +58,6 @@ public function getSignature() } /** - * @param XMLSecurityKey $key - * * @return bool * * @throws LightSamlSecurityException @@ -115,9 +110,6 @@ public function getAlgorithm() } /** - * @param \DOMNode $parent - * @param SerializationContext $context - * * @throws \LogicException */ public function serialize(\DOMNode $parent, SerializationContext $context) @@ -126,9 +118,6 @@ public function serialize(\DOMNode $parent, SerializationContext $context) } /** - * @param \DOMNode $node - * @param DeserializationContext $context - * * @throws \Exception */ public function deserialize(\DOMNode $node, DeserializationContext $context) @@ -141,17 +130,17 @@ public function deserialize(\DOMNode $node, DeserializationContext $context) $this->signature->canonicalizeSignedInfo(); $this->key = null; - $key = new XMLSecurityKey(XMLSecurityKey::RSA_SHA1, array('type' => 'public')); + $key = new XMLSecurityKey(XMLSecurityKey::RSA_SHA1, ['type' => 'public']); XMLSecEnc::staticLocateKeyInfo($key, $node); if ($key->name || $key->key) { $this->key = $key; } - $this->certificates = array(); + $this->certificates = []; $list = $context->getXpath()->query('./ds:KeyInfo/ds:X509Data/ds:X509Certificate', $node); foreach ($list as $certNode) { $certData = trim($certNode->textContent); - $certData = str_replace(array("\r", "\n", "\t", ' '), '', $certData); + $certData = str_replace(["\r", "\n", "\t", ' '], '', $certData); $this->certificates[] = $certData; } } diff --git a/src/LightSaml/Provider/Attribute/AttributeValueProviderInterface.php b/src/LightSaml/Provider/Attribute/AttributeValueProviderInterface.php index 348c43d7..9fc1758b 100644 --- a/src/LightSaml/Provider/Attribute/AttributeValueProviderInterface.php +++ b/src/LightSaml/Provider/Attribute/AttributeValueProviderInterface.php @@ -17,8 +17,6 @@ interface AttributeValueProviderInterface { /** - * @param AssertionContext $context - * * @return Attribute[] */ public function getValues(AssertionContext $context); diff --git a/src/LightSaml/Provider/Attribute/FixedAttributeValueProvider.php b/src/LightSaml/Provider/Attribute/FixedAttributeValueProvider.php index f2a1d700..1e54aa2c 100644 --- a/src/LightSaml/Provider/Attribute/FixedAttributeValueProvider.php +++ b/src/LightSaml/Provider/Attribute/FixedAttributeValueProvider.php @@ -17,11 +17,9 @@ class FixedAttributeValueProvider implements AttributeValueProviderInterface { /** @var Attribute[] */ - protected $attributes = array(); + protected $attributes = []; /** - * @param Attribute $attribute - * * @return FixedAttributeValueProvider */ public function add(Attribute $attribute) @@ -47,8 +45,6 @@ public function setAttributes(array $attributes) } /** - * @param AssertionContext $context - * * @return Attribute[] */ public function getValues(AssertionContext $context) diff --git a/src/LightSaml/Provider/Credential/X509CredentialFileProvider.php b/src/LightSaml/Provider/Credential/X509CredentialFileProvider.php index ceed3133..8c1d9921 100644 --- a/src/LightSaml/Provider/Credential/X509CredentialFileProvider.php +++ b/src/LightSaml/Provider/Credential/X509CredentialFileProvider.php @@ -11,9 +11,9 @@ namespace LightSaml\Provider\Credential; -use LightSaml\Credential\X509Credential; use LightSaml\Credential\KeyHelper; use LightSaml\Credential\X509Certificate; +use LightSaml\Credential\X509Credential; class X509CredentialFileProvider implements CredentialProviderInterface { diff --git a/src/LightSaml/Provider/EntityDescriptor/EntitiesDescriptorEntityProvider.php b/src/LightSaml/Provider/EntityDescriptor/EntitiesDescriptorEntityProvider.php index f057788d..2d17590d 100644 --- a/src/LightSaml/Provider/EntityDescriptor/EntitiesDescriptorEntityProvider.php +++ b/src/LightSaml/Provider/EntityDescriptor/EntitiesDescriptorEntityProvider.php @@ -26,8 +26,7 @@ class EntitiesDescriptorEntityProvider implements EntityDescriptorProviderInterf private $entityDescriptor; /** - * @param EntitiesDescriptorProviderInterface $entitiesDescriptorProvider - * @param string $entityId + * @param string $entityId */ public function __construct(EntitiesDescriptorProviderInterface $entitiesDescriptorProvider, $entityId) { diff --git a/src/LightSaml/Provider/EntityDescriptor/FixedEntityDescriptorProvider.php b/src/LightSaml/Provider/EntityDescriptor/FixedEntityDescriptorProvider.php index 14b02650..433b2365 100644 --- a/src/LightSaml/Provider/EntityDescriptor/FixedEntityDescriptorProvider.php +++ b/src/LightSaml/Provider/EntityDescriptor/FixedEntityDescriptorProvider.php @@ -18,9 +18,6 @@ class FixedEntityDescriptorProvider implements EntityDescriptorProviderInterface /** @var EntityDescriptor */ protected $entityDescriptor; - /** - * @param EntityDescriptor $entityDescriptor - */ public function __construct(EntityDescriptor $entityDescriptor) { $this->entityDescriptor = $entityDescriptor; diff --git a/src/LightSaml/Provider/NameID/FixedNameIdProvider.php b/src/LightSaml/Provider/NameID/FixedNameIdProvider.php index 6119b51e..bed69511 100644 --- a/src/LightSaml/Provider/NameID/FixedNameIdProvider.php +++ b/src/LightSaml/Provider/NameID/FixedNameIdProvider.php @@ -19,17 +19,12 @@ class FixedNameIdProvider implements NameIdProviderInterface /** @var NameID|null */ protected $nameId; - /** - * @param NameID|null $nameId - */ public function __construct(NameID $nameId = null) { $this->nameId = $nameId; } /** - * @param NameID|null $nameId - * * @return FixedNameIdProvider */ public function setNameId(NameID $nameId = null) @@ -40,8 +35,6 @@ public function setNameId(NameID $nameId = null) } /** - * @param AbstractProfileContext $context - * * @return NameID|null */ public function getNameID(AbstractProfileContext $context) diff --git a/src/LightSaml/Provider/NameID/NameIdProviderInterface.php b/src/LightSaml/Provider/NameID/NameIdProviderInterface.php index 7306e055..28fff49b 100644 --- a/src/LightSaml/Provider/NameID/NameIdProviderInterface.php +++ b/src/LightSaml/Provider/NameID/NameIdProviderInterface.php @@ -17,8 +17,6 @@ interface NameIdProviderInterface { /** - * @param AbstractProfileContext $context - * * @return NameID|null */ public function getNameID(AbstractProfileContext $context); diff --git a/src/LightSaml/Resolver/Credential/AbstractCompositeResolver.php b/src/LightSaml/Resolver/Credential/AbstractCompositeResolver.php index d28299a0..2c12e5f0 100644 --- a/src/LightSaml/Resolver/Credential/AbstractCompositeResolver.php +++ b/src/LightSaml/Resolver/Credential/AbstractCompositeResolver.php @@ -14,11 +14,9 @@ abstract class AbstractCompositeResolver extends AbstractQueryableResolver { /** @var CredentialResolverInterface[] */ - protected $resolvers = array(); + protected $resolvers = []; /** - * @param CredentialResolverInterface $resolver - * * @return AbstractCompositeResolver */ public function add(CredentialResolverInterface $resolver) diff --git a/src/LightSaml/Resolver/Credential/AlgorithmFilterResolver.php b/src/LightSaml/Resolver/Credential/AlgorithmFilterResolver.php index 81961484..fd8edaf8 100644 --- a/src/LightSaml/Resolver/Credential/AlgorithmFilterResolver.php +++ b/src/LightSaml/Resolver/Credential/AlgorithmFilterResolver.php @@ -18,18 +18,17 @@ class AlgorithmFilterResolver extends AbstractQueryableResolver { /** - * @param CriteriaSet $criteriaSet * @param CredentialInterface[] $arrCredentials * * @return CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()) + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []) { if (false == $criteriaSet->has(AlgorithmCriteria::class)) { return $arrCredentials; } - $result = array(); + $result = []; foreach ($criteriaSet->get(AlgorithmCriteria::class) as $criteria) { /* @var AlgorithmCriteria $criteria */ foreach ($arrCredentials as $credential) { diff --git a/src/LightSaml/Resolver/Credential/CompositeFilterResolver.php b/src/LightSaml/Resolver/Credential/CompositeFilterResolver.php index daa9c3b2..861825be 100644 --- a/src/LightSaml/Resolver/Credential/CompositeFilterResolver.php +++ b/src/LightSaml/Resolver/Credential/CompositeFilterResolver.php @@ -17,12 +17,11 @@ class CompositeFilterResolver extends AbstractCompositeResolver { /** - * @param CriteriaSet $criteriaSet * @param CredentialInterface[] $arrCredentials * * @return CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()) + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []) { $result = $arrCredentials; foreach ($this->resolvers as $resolver) { diff --git a/src/LightSaml/Resolver/Credential/CompositeUnionResolver.php b/src/LightSaml/Resolver/Credential/CompositeUnionResolver.php index 8df4b60b..482e99c4 100644 --- a/src/LightSaml/Resolver/Credential/CompositeUnionResolver.php +++ b/src/LightSaml/Resolver/Credential/CompositeUnionResolver.php @@ -17,14 +17,13 @@ class CompositeUnionResolver extends AbstractCompositeResolver { /** - * @param CriteriaSet $criteriaSet * @param CredentialInterface[] $arrCredentials * * @return CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()) + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []) { - $result = array(); + $result = []; foreach ($this->resolvers as $resolver) { $result = array_merge($result, $resolver->resolve($criteriaSet, $arrCredentials)); } diff --git a/src/LightSaml/Resolver/Credential/CredentialNameFilterResolver.php b/src/LightSaml/Resolver/Credential/CredentialNameFilterResolver.php index 02fe656d..01b33284 100644 --- a/src/LightSaml/Resolver/Credential/CredentialNameFilterResolver.php +++ b/src/LightSaml/Resolver/Credential/CredentialNameFilterResolver.php @@ -18,18 +18,17 @@ class CredentialNameFilterResolver extends AbstractQueryableResolver { /** - * @param CriteriaSet $criteriaSet * @param CredentialInterface[] $arrCredentials * * @return CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()) + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []) { if (false == $criteriaSet->has(CredentialNameCriteria::class)) { return $arrCredentials; } - $result = array(); + $result = []; foreach ($criteriaSet->get(CredentialNameCriteria::class) as $criteria) { /* @var CredentialNameCriteria $criteria */ foreach ($arrCredentials as $credential) { diff --git a/src/LightSaml/Resolver/Credential/CredentialResolverInterface.php b/src/LightSaml/Resolver/Credential/CredentialResolverInterface.php index 5316148d..cf54fec1 100644 --- a/src/LightSaml/Resolver/Credential/CredentialResolverInterface.php +++ b/src/LightSaml/Resolver/Credential/CredentialResolverInterface.php @@ -17,12 +17,11 @@ interface CredentialResolverInterface { /** - * @param CriteriaSet $criteriaSet * @param array|CredentialInterface[] $arrCredentials * * @return array|CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()); + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []); /** * @return CredentialResolverQuery diff --git a/src/LightSaml/Resolver/Credential/CredentialResolverQuery.php b/src/LightSaml/Resolver/Credential/CredentialResolverQuery.php index 1744ac24..e8eefdd6 100644 --- a/src/LightSaml/Resolver/Credential/CredentialResolverQuery.php +++ b/src/LightSaml/Resolver/Credential/CredentialResolverQuery.php @@ -11,8 +11,8 @@ namespace LightSaml\Resolver\Credential; -use LightSaml\Criteria\CriteriaSet; use LightSaml\Credential\CredentialInterface; +use LightSaml\Criteria\CriteriaSet; class CredentialResolverQuery extends CriteriaSet { @@ -22,9 +22,6 @@ class CredentialResolverQuery extends CriteriaSet /** @var CredentialInterface[] */ private $arrCredentials; - /** - * @param CredentialResolverInterface $resolver - */ public function __construct(CredentialResolverInterface $resolver) { $this->resolver = $resolver; @@ -61,7 +58,7 @@ public function allCredentials() */ public function getPublicKeys() { - $result = array(); + $result = []; foreach ($this->arrCredentials as $credential) { if ($credential instanceof CredentialInterface) { $publicKey = $credential->getPublicKey(); @@ -81,7 +78,7 @@ public function getPublicKeys() */ public function getPrivateKeys() { - $result = array(); + $result = []; foreach ($this->arrCredentials as $credential) { if ($credential instanceof CredentialInterface) { $privateKey = $credential->getPrivateKey(); diff --git a/src/LightSaml/Resolver/Credential/EntityIdResolver.php b/src/LightSaml/Resolver/Credential/EntityIdResolver.php index 9ba61fbb..7e3203d6 100644 --- a/src/LightSaml/Resolver/Credential/EntityIdResolver.php +++ b/src/LightSaml/Resolver/Credential/EntityIdResolver.php @@ -12,32 +12,28 @@ namespace LightSaml\Resolver\Credential; use LightSaml\Credential\CredentialInterface; -use LightSaml\Store\Credential\CredentialStoreInterface; -use LightSaml\Criteria\CriteriaSet; use LightSaml\Credential\Criteria\EntityIdCriteria; +use LightSaml\Criteria\CriteriaSet; +use LightSaml\Store\Credential\CredentialStoreInterface; class EntityIdResolver extends AbstractQueryableResolver { /** @var CredentialStoreInterface */ protected $credentialStore; - /** - * @param CredentialStoreInterface $credentialStore - */ public function __construct(CredentialStoreInterface $credentialStore) { $this->credentialStore = $credentialStore; } /** - * @param CriteriaSet $criteriaSet * @param array|CredentialInterface[] $arrCredentials * * @return array|CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()) + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []) { - $result = array(); + $result = []; foreach ($criteriaSet->get(EntityIdCriteria::class) as $criteria) { /* @var EntityIdCriteria $criteria */ $result = array_merge($result, $this->credentialStore->getByEntityId($criteria->getEntityId())); diff --git a/src/LightSaml/Resolver/Credential/Factory/CredentialResolverFactory.php b/src/LightSaml/Resolver/Credential/Factory/CredentialResolverFactory.php index 72fa3a74..9f9820aa 100644 --- a/src/LightSaml/Resolver/Credential/Factory/CredentialResolverFactory.php +++ b/src/LightSaml/Resolver/Credential/Factory/CredentialResolverFactory.php @@ -28,9 +28,6 @@ class CredentialResolverFactory /** @var CredentialStoreInterface */ protected $credentialStore; - /** - * @param CredentialStoreInterface $credentialStore - */ public function __construct(CredentialStoreInterface $credentialStore) { $this->credentialStore = $credentialStore; diff --git a/src/LightSaml/Resolver/Credential/MetadataFilterResolver.php b/src/LightSaml/Resolver/Credential/MetadataFilterResolver.php index d3a0946c..77994435 100644 --- a/src/LightSaml/Resolver/Credential/MetadataFilterResolver.php +++ b/src/LightSaml/Resolver/Credential/MetadataFilterResolver.php @@ -11,28 +11,27 @@ namespace LightSaml\Resolver\Credential; -use LightSaml\Model\Metadata\IdpSsoDescriptor; -use LightSaml\Model\Metadata\SpSsoDescriptor; use LightSaml\Credential\Context\MetadataCredentialContext; use LightSaml\Credential\CredentialInterface; -use LightSaml\Criteria\CriteriaSet; use LightSaml\Credential\Criteria\MetadataCriteria; +use LightSaml\Criteria\CriteriaSet; +use LightSaml\Model\Metadata\IdpSsoDescriptor; +use LightSaml\Model\Metadata\SpSsoDescriptor; class MetadataFilterResolver extends AbstractQueryableResolver { /** - * @param CriteriaSet $criteriaSet * @param CredentialInterface[] $arrCredentials * * @return CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()) + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []) { if (false == $criteriaSet->has(MetadataCriteria::class)) { return $arrCredentials; } - $result = array(); + $result = []; foreach ($criteriaSet->get(MetadataCriteria::class) as $criteria) { /* @var MetadataCriteria $criteria */ foreach ($arrCredentials as $credential) { diff --git a/src/LightSaml/Resolver/Credential/PrivateKeyResolver.php b/src/LightSaml/Resolver/Credential/PrivateKeyResolver.php index 148161e5..5bde09f2 100644 --- a/src/LightSaml/Resolver/Credential/PrivateKeyResolver.php +++ b/src/LightSaml/Resolver/Credential/PrivateKeyResolver.php @@ -12,24 +12,23 @@ namespace LightSaml\Resolver\Credential; use LightSaml\Credential\CredentialInterface; -use LightSaml\Criteria\CriteriaSet; use LightSaml\Credential\Criteria\PrivateKeyCriteria; +use LightSaml\Criteria\CriteriaSet; class PrivateKeyResolver extends AbstractQueryableResolver { /** - * @param CriteriaSet $criteriaSet * @param CredentialInterface[] $arrCredentials * * @return CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()) + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []) { if (false == $criteriaSet->has(PrivateKeyCriteria::class)) { return $arrCredentials; } - $result = array(); + $result = []; foreach ($arrCredentials as $credential) { if ($credential->getPrivateKey()) { $result[] = $credential; diff --git a/src/LightSaml/Resolver/Credential/PublicKeyThumbprintResolver.php b/src/LightSaml/Resolver/Credential/PublicKeyThumbprintResolver.php index 87605091..b7d0ffc3 100644 --- a/src/LightSaml/Resolver/Credential/PublicKeyThumbprintResolver.php +++ b/src/LightSaml/Resolver/Credential/PublicKeyThumbprintResolver.php @@ -18,18 +18,17 @@ class PublicKeyThumbprintResolver extends AbstractQueryableResolver { /** - * @param CriteriaSet $criteriaSet * @param CredentialInterface[] $arrCredentials * * @return CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()) + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []) { if (false == $criteriaSet->has(PublicKeyThumbprintCriteria::class)) { return $arrCredentials; } - $result = array(); + $result = []; /** @var PublicKeyThumbprintCriteria $criteria */ foreach ($criteriaSet->get(PublicKeyThumbprintCriteria::class) as $criteria) { foreach ($arrCredentials as $credential) { diff --git a/src/LightSaml/Resolver/Credential/UsageFilterResolver.php b/src/LightSaml/Resolver/Credential/UsageFilterResolver.php index 446723d4..2c34f5b8 100644 --- a/src/LightSaml/Resolver/Credential/UsageFilterResolver.php +++ b/src/LightSaml/Resolver/Credential/UsageFilterResolver.php @@ -12,24 +12,23 @@ namespace LightSaml\Resolver\Credential; use LightSaml\Credential\CredentialInterface; -use LightSaml\Criteria\CriteriaSet; use LightSaml\Credential\Criteria\UsageCriteria; +use LightSaml\Criteria\CriteriaSet; class UsageFilterResolver extends AbstractQueryableResolver { /** - * @param CriteriaSet $criteriaSet * @param CredentialInterface[] $arrCredentials * * @return CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()) + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []) { if (false == $criteriaSet->has(UsageCriteria::class)) { return $arrCredentials; } - $result = array(); + $result = []; foreach ($criteriaSet->get(UsageCriteria::class) as $criteria) { /* @var UsageCriteria $criteria */ foreach ($arrCredentials as $credential) { diff --git a/src/LightSaml/Resolver/Credential/X509CredentialResolver.php b/src/LightSaml/Resolver/Credential/X509CredentialResolver.php index 7e85dc36..b5489308 100644 --- a/src/LightSaml/Resolver/Credential/X509CredentialResolver.php +++ b/src/LightSaml/Resolver/Credential/X509CredentialResolver.php @@ -11,26 +11,25 @@ namespace LightSaml\Resolver\Credential; -use LightSaml\Criteria\CriteriaSet; use LightSaml\Credential\CredentialInterface; -use LightSaml\Credential\X509CredentialInterface; use LightSaml\Credential\Criteria\X509CredentialCriteria; +use LightSaml\Credential\X509CredentialInterface; +use LightSaml\Criteria\CriteriaSet; class X509CredentialResolver extends AbstractQueryableResolver { /** - * @param CriteriaSet $criteriaSet * @param CredentialInterface[] $arrCredentials * * @return CredentialInterface[] */ - public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = array()) + public function resolve(CriteriaSet $criteriaSet, array $arrCredentials = []) { if (false == $criteriaSet->has(X509CredentialCriteria::class)) { return $arrCredentials; } - $result = array(); + $result = []; foreach ($arrCredentials as $credential) { if ($credential instanceof X509CredentialInterface) { $result[] = $credential; diff --git a/src/LightSaml/Resolver/Endpoint/BindingEndpointResolver.php b/src/LightSaml/Resolver/Endpoint/BindingEndpointResolver.php index d3ecc904..0f1969bd 100644 --- a/src/LightSaml/Resolver/Endpoint/BindingEndpointResolver.php +++ b/src/LightSaml/Resolver/Endpoint/BindingEndpointResolver.php @@ -11,14 +11,13 @@ namespace LightSaml\Resolver\Endpoint; -use LightSaml\Model\Metadata\EndpointReference; use LightSaml\Criteria\CriteriaSet; +use LightSaml\Model\Metadata\EndpointReference; use LightSaml\Resolver\Endpoint\Criteria\BindingCriteria; class BindingEndpointResolver implements EndpointResolverInterface { /** - * @param CriteriaSet $criteriaSet * @param EndpointReference[] $candidates * * @return EndpointReference[] @@ -29,7 +28,7 @@ public function resolve(CriteriaSet $criteriaSet, array $candidates) return $candidates; } - $arrOrdered = array(); + $arrOrdered = []; /** @var BindingCriteria $bindingCriteria */ foreach ($criteriaSet->get(BindingCriteria::class) as $bindingCriteria) { foreach ($candidates as $endpointReference) { @@ -42,7 +41,7 @@ public function resolve(CriteriaSet $criteriaSet, array $candidates) ksort($arrOrdered); - $result = array(); + $result = []; foreach ($arrOrdered as $arr) { foreach ($arr as $endpointReference) { $result[] = $endpointReference; diff --git a/src/LightSaml/Resolver/Endpoint/CompositeEndpointResolver.php b/src/LightSaml/Resolver/Endpoint/CompositeEndpointResolver.php index 3e7b6d31..f4ee27ed 100644 --- a/src/LightSaml/Resolver/Endpoint/CompositeEndpointResolver.php +++ b/src/LightSaml/Resolver/Endpoint/CompositeEndpointResolver.php @@ -17,19 +17,17 @@ class CompositeEndpointResolver implements EndpointResolverInterface { /** @var EndpointResolverInterface[] */ - protected $resolvers = array(); + protected $resolvers = []; /** * @param EndpointResolverInterface[] $builders */ - public function __construct(array $builders = array()) + public function __construct(array $builders = []) { $this->resolvers = $builders; } /** - * @param EndpointResolverInterface $builder - * * @return CompositeEndpointResolver */ public function add(EndpointResolverInterface $builder) @@ -40,7 +38,6 @@ public function add(EndpointResolverInterface $builder) } /** - * @param CriteriaSet $criteriaSet * @param EndpointReference[] $candidates * * @return EndpointReference[] diff --git a/src/LightSaml/Resolver/Endpoint/Criteria/BindingCriteria.php b/src/LightSaml/Resolver/Endpoint/Criteria/BindingCriteria.php index 747e1a19..67ac1004 100644 --- a/src/LightSaml/Resolver/Endpoint/Criteria/BindingCriteria.php +++ b/src/LightSaml/Resolver/Endpoint/Criteria/BindingCriteria.php @@ -27,7 +27,7 @@ class BindingCriteria implements CriteriaInterface */ public function __construct(array $bindings) { - $this->bindings = array(); + $this->bindings = []; foreach ($bindings as $binding) { $this->add($binding); diff --git a/src/LightSaml/Resolver/Endpoint/DescriptorTypeEndpointResolver.php b/src/LightSaml/Resolver/Endpoint/DescriptorTypeEndpointResolver.php index f3cfd9ce..67e4862b 100644 --- a/src/LightSaml/Resolver/Endpoint/DescriptorTypeEndpointResolver.php +++ b/src/LightSaml/Resolver/Endpoint/DescriptorTypeEndpointResolver.php @@ -23,7 +23,6 @@ class DescriptorTypeEndpointResolver implements EndpointResolverInterface { /** - * @param CriteriaSet $criteriaSet * @param EndpointReference[] $candidates * * @return EndpointReference[] @@ -34,7 +33,7 @@ public function resolve(CriteriaSet $criteriaSet, array $candidates) return $candidates; } - $result = array(); + $result = []; /** @var DescriptorTypeCriteria $descriptorTypeCriteria */ foreach ($criteriaSet->get(DescriptorTypeCriteria::class) as $descriptorTypeCriteria) { foreach ($candidates as $endpointReference) { diff --git a/src/LightSaml/Resolver/Endpoint/EndpointResolverInterface.php b/src/LightSaml/Resolver/Endpoint/EndpointResolverInterface.php index bce1cca2..47571b72 100644 --- a/src/LightSaml/Resolver/Endpoint/EndpointResolverInterface.php +++ b/src/LightSaml/Resolver/Endpoint/EndpointResolverInterface.php @@ -17,7 +17,6 @@ interface EndpointResolverInterface { /** - * @param CriteriaSet $criteriaSet * @param EndpointReference[] $candidates * * @return EndpointReference[] diff --git a/src/LightSaml/Resolver/Endpoint/IndexEndpointResolver.php b/src/LightSaml/Resolver/Endpoint/IndexEndpointResolver.php index 895b74db..91dfd66b 100644 --- a/src/LightSaml/Resolver/Endpoint/IndexEndpointResolver.php +++ b/src/LightSaml/Resolver/Endpoint/IndexEndpointResolver.php @@ -11,15 +11,14 @@ namespace LightSaml\Resolver\Endpoint; +use LightSaml\Criteria\CriteriaSet; use LightSaml\Model\Metadata\EndpointReference; use LightSaml\Model\Metadata\IndexedEndpoint; use LightSaml\Resolver\Endpoint\Criteria\IndexCriteria; -use LightSaml\Criteria\CriteriaSet; class IndexEndpointResolver implements EndpointResolverInterface { /** - * @param CriteriaSet $criteriaSet * @param EndpointReference[] $candidates * * @return EndpointReference[] @@ -30,7 +29,7 @@ public function resolve(CriteriaSet $criteriaSet, array $candidates) return $candidates; } - $result = array(); + $result = []; /** @var IndexCriteria $indexCriteria */ foreach ($criteriaSet->get(IndexCriteria::class) as $indexCriteria) { foreach ($candidates as $endpointReference) { diff --git a/src/LightSaml/Resolver/Endpoint/LocationEndpointResolver.php b/src/LightSaml/Resolver/Endpoint/LocationEndpointResolver.php index 01ec70d0..ea5e6159 100644 --- a/src/LightSaml/Resolver/Endpoint/LocationEndpointResolver.php +++ b/src/LightSaml/Resolver/Endpoint/LocationEndpointResolver.php @@ -11,14 +11,13 @@ namespace LightSaml\Resolver\Endpoint; +use LightSaml\Criteria\CriteriaSet; use LightSaml\Model\Metadata\EndpointReference; use LightSaml\Resolver\Endpoint\Criteria\LocationCriteria; -use LightSaml\Criteria\CriteriaSet; class LocationEndpointResolver implements EndpointResolverInterface { /** - * @param CriteriaSet $criteriaSet * @param EndpointReference[] $candidates * * @return EndpointReference[] @@ -29,7 +28,7 @@ public function resolve(CriteriaSet $criteriaSet, array $candidates) return $candidates; } - $result = array(); + $result = []; /** @var LocationCriteria $locationCriteria */ foreach ($criteriaSet->get(LocationCriteria::class) as $locationCriteria) { foreach ($candidates as $endpointReference) { diff --git a/src/LightSaml/Resolver/Endpoint/ServiceTypeEndpointResolver.php b/src/LightSaml/Resolver/Endpoint/ServiceTypeEndpointResolver.php index 05fac691..1a74fea4 100644 --- a/src/LightSaml/Resolver/Endpoint/ServiceTypeEndpointResolver.php +++ b/src/LightSaml/Resolver/Endpoint/ServiceTypeEndpointResolver.php @@ -23,7 +23,6 @@ class ServiceTypeEndpointResolver implements EndpointResolverInterface { /** - * @param CriteriaSet $criteriaSet * @param EndpointReference[] $candidates * * @return EndpointReference[] @@ -34,7 +33,7 @@ public function resolve(CriteriaSet $criteriaSet, array $candidates) return $candidates; } - $result = array(); + $result = []; /** @var ServiceTypeCriteria $serviceTypeCriteria */ foreach ($criteriaSet->get(ServiceTypeCriteria::class) as $serviceTypeCriteria) { foreach ($candidates as $endpointReference) { diff --git a/src/LightSaml/Resolver/Session/SessionProcessor.php b/src/LightSaml/Resolver/Session/SessionProcessor.php index b0d07706..60c9460a 100644 --- a/src/LightSaml/Resolver/Session/SessionProcessor.php +++ b/src/LightSaml/Resolver/Session/SessionProcessor.php @@ -25,10 +25,6 @@ class SessionProcessor implements SessionProcessorInterface /** @var TimeProviderInterface */ protected $timeProvider; - /** - * @param SsoStateStoreInterface $ssoStateStore - * @param TimeProviderInterface $timeProvider - */ public function __construct(SsoStateStoreInterface $ssoStateStore, TimeProviderInterface $timeProvider) { $this->ssoStateStore = $ssoStateStore; @@ -59,8 +55,6 @@ public function processAssertions(array $assertions, $ownEntityId, $partyEntityI } /** - * @param Assertion $assertion - * * @return bool */ protected function supportsSession(Assertion $assertion) @@ -73,11 +67,8 @@ protected function supportsSession(Assertion $assertion) } /** - * @param string $ownEntityId - * @param string $partyEntityId - * @param SsoState $ssoState - * @param Assertion $assertion - * @param \DateTime $now + * @param string $ownEntityId + * @param string $partyEntityId */ protected function checkSession($ownEntityId, $partyEntityId, SsoState $ssoState, Assertion $assertion, \DateTime $now) { @@ -91,11 +82,8 @@ protected function checkSession($ownEntityId, $partyEntityId, SsoState $ssoState } /** - * @param SsoState $ssoState - * @param Assertion $assertion - * @param \DateTime $now - * @param string $ownEntityId - * @param string $partyEntityId + * @param string $ownEntityId + * @param string $partyEntityId * * @return SsoSessionState */ @@ -118,7 +106,6 @@ protected function createSession(SsoState $ssoState, Assertion $assertion, \Date /** * @param SsoSessionState[] $sessions - * @param \DateTime $now */ protected function updateLastAuthn(array $sessions, \DateTime $now) { @@ -128,10 +115,8 @@ protected function updateLastAuthn(array $sessions, \DateTime $now) } /** - * @param SsoState $ssoState - * @param Assertion $assertion - * @param string $ownEntityId - * @param string $partyEntityId + * @param string $ownEntityId + * @param string $partyEntityId * * @return \LightSaml\State\Sso\SsoSessionState[] */ diff --git a/src/LightSaml/Resolver/Signature/OwnSignatureResolver.php b/src/LightSaml/Resolver/Signature/OwnSignatureResolver.php index dbcf882d..e4758ee1 100644 --- a/src/LightSaml/Resolver/Signature/OwnSignatureResolver.php +++ b/src/LightSaml/Resolver/Signature/OwnSignatureResolver.php @@ -13,33 +13,28 @@ use LightSaml\Context\Profile\AbstractProfileContext; use LightSaml\Context\Profile\ProfileContext; -use LightSaml\Error\LightSamlContextException; -use LightSaml\Model\XmlDSig\SignatureWriter; -use LightSaml\Resolver\Credential\CredentialResolverInterface; -use LightSaml\SamlConstants; -use LightSaml\Credential\UsageType; -use LightSaml\Credential\X509CredentialInterface; use LightSaml\Credential\Criteria\EntityIdCriteria; use LightSaml\Credential\Criteria\MetadataCriteria; use LightSaml\Credential\Criteria\UsageCriteria; use LightSaml\Credential\Criteria\X509CredentialCriteria; +use LightSaml\Credential\UsageType; +use LightSaml\Credential\X509CredentialInterface; +use LightSaml\Error\LightSamlContextException; +use LightSaml\Model\XmlDSig\SignatureWriter; +use LightSaml\Resolver\Credential\CredentialResolverInterface; +use LightSaml\SamlConstants; class OwnSignatureResolver implements SignatureResolverInterface { /** @var CredentialResolverInterface */ protected $credentialResolver; - /** - * @param CredentialResolverInterface $credentialResolver - */ public function __construct(CredentialResolverInterface $credentialResolver) { $this->credentialResolver = $credentialResolver; } /** - * @param AbstractProfileContext $context - * * @return SignatureWriter */ public function getSignature(AbstractProfileContext $context) @@ -56,8 +51,6 @@ public function getSignature(AbstractProfileContext $context) } /** - * @param AbstractProfileContext $context - * * @return X509CredentialInterface|null */ private function getSigningCredential(AbstractProfileContext $context) diff --git a/src/LightSaml/Resolver/Signature/SignatureResolverInterface.php b/src/LightSaml/Resolver/Signature/SignatureResolverInterface.php index 3738d476..c121edf5 100644 --- a/src/LightSaml/Resolver/Signature/SignatureResolverInterface.php +++ b/src/LightSaml/Resolver/Signature/SignatureResolverInterface.php @@ -17,8 +17,6 @@ interface SignatureResolverInterface { /** - * @param AbstractProfileContext $context - * * @return SignatureWriter|null */ public function getSignature(AbstractProfileContext $context); diff --git a/src/LightSaml/SamlConstants.php b/src/LightSaml/SamlConstants.php index 7816fa6b..4ce0e9d9 100644 --- a/src/LightSaml/SamlConstants.php +++ b/src/LightSaml/SamlConstants.php @@ -88,13 +88,13 @@ abstract class SamlConstants */ public static function isProtocolValid($value) { - static $arr = array( + static $arr = [ self::PROTOCOL_SAML2, self::PROTOCOL_SAML1, self::PROTOCOL_SAML11, self::PROTOCOL_SHIB1, self::PROTOCOL_WS_FED, - ); + ]; return in_array($value, $arr); } @@ -106,12 +106,12 @@ public static function isProtocolValid($value) */ public static function isNsValid($value) { - static $arr = array( + static $arr = [ self::NS_PROTOCOL, self::NS_METADATA, self::NS_ASSERTION, self::NS_XMLDSIG, - ); + ]; return in_array($value, $arr); } @@ -123,7 +123,7 @@ public static function isNsValid($value) */ public static function isNameIdFormatValid($value) { - static $arr = array( + static $arr = [ self::NAME_ID_FORMAT_NONE, self::NAME_ID_FORMAT_ENTITY, self::NAME_ID_FORMAT_PERSISTENT, @@ -134,7 +134,7 @@ public static function isNameIdFormatValid($value) self::NAME_ID_FORMAT_WINDOWS, self::NAME_ID_FORMAT_KERBEROS, self::NAME_ID_FORMAT_UNSPECIFIED, - ); + ]; return in_array($value, $arr); } @@ -146,7 +146,7 @@ public static function isNameIdFormatValid($value) */ public static function isBindingValid($value) { - static $arr = array( + static $arr = [ self::BINDING_SAML2_HTTP_REDIRECT, self::BINDING_SAML2_HTTP_POST, self::BINDING_SAML2_HTTP_ARTIFACT, @@ -156,7 +156,7 @@ public static function isBindingValid($value) self::BINDING_SAML1_BROWSER_POST, self::BINDING_SAML1_ARTIFACT1, self::BINDING_WS_FED_WEB_SVC, - ); + ]; return in_array($value, $arr); } @@ -168,7 +168,7 @@ public static function isBindingValid($value) */ public static function isStatusValid($value) { - static $arr = array( + static $arr = [ self::STATUS_SUCCESS, self::STATUS_REQUESTER, self::STATUS_RESPONDER, @@ -178,7 +178,7 @@ public static function isStatusValid($value) self::STATUS_PROXY_COUNT_EXCEEDED, self::STATUS_INVALID_NAME_ID_POLICY, self::STATUS_UNSUPPORTED_BINDING, - ); + ]; return in_array($value, $arr); } @@ -190,11 +190,11 @@ public static function isStatusValid($value) */ public static function isConfirmationMethodValid($value) { - static $arr = array( + static $arr = [ self::CONFIRMATION_METHOD_BEARER, self::CONFIRMATION_METHOD_HOK, self::CONFIRMATION_METHOD_SENDER_VOUCHES, - ); + ]; return in_array($value, $arr); } @@ -206,12 +206,12 @@ public static function isConfirmationMethodValid($value) */ public static function isAuthnContextValid($value) { - static $arr = array( + static $arr = [ self::AUTHN_CONTEXT_PASSWORD, self::AUTHN_CONTEXT_UNSPECIFIED, self::AUTHN_CONTEXT_PASSWORD_PROTECTED_TRANSPORT, self::AUTHN_CONTEXT_WINDOWS, - ); + ]; return in_array($value, $arr); } @@ -223,12 +223,12 @@ public static function isAuthnContextValid($value) */ public static function isLogoutReasonValid($value) { - static $arr = array( + static $arr = [ self::LOGOUT_REASON_USER, self::LOGOUT_REASON_ADMIN, self::LOGOUT_REASON_GLOBAL_TIMEOUT, self::LOGOUT_REASON_SP_TIMEOUT, - ); + ]; return in_array($value, $arr); } diff --git a/src/LightSaml/State/Request/RequestState.php b/src/LightSaml/State/Request/RequestState.php index d03b9578..74cfc30e 100644 --- a/src/LightSaml/State/Request/RequestState.php +++ b/src/LightSaml/State/Request/RequestState.php @@ -98,7 +98,7 @@ public function serialize() { $nonce = $this->getNonce(); - return serialize(array($this->id, $nonce, $this->parameters->serialize())); + return serialize([$this->id, $nonce, $this->parameters->serialize()]); } /** diff --git a/src/LightSaml/State/Sso/SsoSessionState.php b/src/LightSaml/State/Sso/SsoSessionState.php index 33d079e0..0077753d 100644 --- a/src/LightSaml/State/Sso/SsoSessionState.php +++ b/src/LightSaml/State/Sso/SsoSessionState.php @@ -282,12 +282,7 @@ public function getOtherPartyId($partyId) return $this->idpEntityId; } - throw new LightSamlException(sprintf( - 'Party "%s" is not included in sso session between "%s" and "%s"', - $partyId, - $this->idpEntityId, - $this->spEntityId - )); + throw new LightSamlException(sprintf('Party "%s" is not included in sso session between "%s" and "%s"', $partyId, $this->idpEntityId, $this->spEntityId)); } /** @@ -295,7 +290,7 @@ public function getOtherPartyId($partyId) */ public function serialize() { - return serialize(array( + return serialize([ $this->idpEntityId, $this->spEntityId, $this->nameId, @@ -306,7 +301,7 @@ public function serialize() $this->lastAuthOn, [], $this->parameters, - )); + ]); } /** diff --git a/src/LightSaml/State/Sso/SsoState.php b/src/LightSaml/State/Sso/SsoState.php index 45adb390..1806b042 100644 --- a/src/LightSaml/State/Sso/SsoState.php +++ b/src/LightSaml/State/Sso/SsoState.php @@ -22,7 +22,7 @@ class SsoState implements \Serializable private $parameters; /** @var SsoSessionState[] */ - private $ssoSessions = array(); + private $ssoSessions = []; public function __construct() { @@ -123,7 +123,7 @@ public function getSsoSessions() */ public function setSsoSessions(array $ssoSessions) { - $this->ssoSessions = array(); + $this->ssoSessions = []; foreach ($ssoSessions as $ssoSession) { $this->addSsoSession($ssoSession); } @@ -132,8 +132,6 @@ public function setSsoSessions(array $ssoSessions) } /** - * @param SsoSessionState $ssoSessionState - * * @return SsoState */ public function addSsoSession(SsoSessionState $ssoSessionState) @@ -154,7 +152,7 @@ public function addSsoSession(SsoSessionState $ssoSessionState) */ public function filter($idpEntityId, $spEntityId, $nameId, $nameIdFormat, $sessionIndex) { - $result = array(); + $result = []; foreach ($this->ssoSessions as $ssoSession) { if ((!$idpEntityId || $ssoSession->getIdpEntityId() === $idpEntityId) && @@ -187,12 +185,12 @@ public function modify($callback) */ public function serialize() { - return serialize(array( + return serialize([ $this->localSessionId, $this->ssoSessions, [], $this->parameters, - )); + ]); } /** diff --git a/src/LightSaml/Store/Credential/CompositeCredentialStore.php b/src/LightSaml/Store/Credential/CompositeCredentialStore.php index a73d28f6..fb77b580 100644 --- a/src/LightSaml/Store/Credential/CompositeCredentialStore.php +++ b/src/LightSaml/Store/Credential/CompositeCredentialStore.php @@ -16,7 +16,7 @@ class CompositeCredentialStore implements CredentialStoreInterface { /** @var CredentialStoreInterface[] */ - protected $stores = array(); + protected $stores = []; /** * @param string $entityId @@ -25,7 +25,7 @@ class CompositeCredentialStore implements CredentialStoreInterface */ public function getByEntityId($entityId) { - $result = array(); + $result = []; foreach ($this->stores as $store) { $result = array_merge($result, $store->getByEntityId($entityId)); } @@ -34,8 +34,6 @@ public function getByEntityId($entityId) } /** - * @param CredentialStoreInterface $store - * * @return CompositeCredentialStore */ public function add(CredentialStoreInterface $store) diff --git a/src/LightSaml/Store/Credential/Factory/CredentialFactory.php b/src/LightSaml/Store/Credential/Factory/CredentialFactory.php index d4194e4e..ff5c6d54 100644 --- a/src/LightSaml/Store/Credential/Factory/CredentialFactory.php +++ b/src/LightSaml/Store/Credential/Factory/CredentialFactory.php @@ -25,8 +25,6 @@ class CredentialFactory private $extraCredentials = []; /** - * @param CredentialInterface $credential - * * @return CredentialFactory */ public function addExtraCredential(CredentialInterface $credential) @@ -37,11 +35,8 @@ public function addExtraCredential(CredentialInterface $credential) } /** - * @param EntityDescriptorStoreInterface $idpEntityDescriptorStore - * @param EntityDescriptorStoreInterface $spEntityDescriptorStore - * @param string $ownEntityId - * @param CredentialStoreInterface $ownCredentialStore - * @param CredentialInterface[] $extraCredentials + * @param string $ownEntityId + * @param CredentialInterface[] $extraCredentials * * @return CompositeCredentialStore */ @@ -61,10 +56,8 @@ public function buildFromOwnCredentialStore( } /** - * @param EntityDescriptorStoreInterface $idpEntityDescriptorStore - * @param EntityDescriptorStoreInterface $spEntityDescriptorStore - * @param CredentialInterface[] $ownCredentials - * @param CredentialInterface[] $extraCredentials + * @param CredentialInterface[] $ownCredentials + * @param CredentialInterface[] $extraCredentials * * @return CompositeCredentialStore */ diff --git a/src/LightSaml/Store/Credential/MetadataCredentialStore.php b/src/LightSaml/Store/Credential/MetadataCredentialStore.php index 469f2d7c..3ad73cc0 100644 --- a/src/LightSaml/Store/Credential/MetadataCredentialStore.php +++ b/src/LightSaml/Store/Credential/MetadataCredentialStore.php @@ -11,22 +11,19 @@ namespace LightSaml\Store\Credential; -use LightSaml\Store\EntityDescriptor\EntityDescriptorStoreInterface; -use LightSaml\Model\Metadata\EntityDescriptor; -use LightSaml\Model\Metadata\SSODescriptor; use LightSaml\Credential\Context\CredentialContextSet; use LightSaml\Credential\Context\MetadataCredentialContext; use LightSaml\Credential\CredentialInterface; use LightSaml\Credential\X509Credential; +use LightSaml\Model\Metadata\EntityDescriptor; +use LightSaml\Model\Metadata\SSODescriptor; +use LightSaml\Store\EntityDescriptor\EntityDescriptorStoreInterface; class MetadataCredentialStore implements CredentialStoreInterface { /** @var EntityDescriptorStoreInterface */ protected $entityDescriptorProvider; - /** - * @param EntityDescriptorStoreInterface $entityDescriptorProvider - */ public function __construct(EntityDescriptorStoreInterface $entityDescriptorProvider) { $this->entityDescriptorProvider = $entityDescriptorProvider; @@ -41,20 +38,18 @@ public function getByEntityId($entityId) { $entityDescriptor = $this->entityDescriptorProvider->get($entityId); if (false == $entityDescriptor) { - return array(); + return []; } return $this->extractCredentials($entityDescriptor); } /** - * @param EntityDescriptor $entityDescriptor - * * @return CredentialInterface[] */ protected function extractCredentials(EntityDescriptor $entityDescriptor) { - $result = array(); + $result = []; foreach ($entityDescriptor->getAllIdpSsoDescriptors() as $idpDescriptor) { $this->handleDescriptor($idpDescriptor, $entityDescriptor, $result); @@ -66,20 +61,15 @@ protected function extractCredentials(EntityDescriptor $entityDescriptor) return $result; } - /** - * @param SSODescriptor $ssoDescriptor - * @param EntityDescriptor $entityDescriptor - * @param array $result - */ protected function handleDescriptor(SSODescriptor $ssoDescriptor, EntityDescriptor $entityDescriptor, array &$result) { foreach ($ssoDescriptor->getAllKeyDescriptors() as $keyDescriptor) { $credential = (new X509Credential($keyDescriptor->getCertificate())) ->setEntityId($entityDescriptor->getEntityID()) ->addKeyName($keyDescriptor->getCertificate()->getName()) - ->setCredentialContext(new CredentialContextSet(array( + ->setCredentialContext(new CredentialContextSet([ new MetadataCredentialContext($keyDescriptor, $ssoDescriptor, $entityDescriptor), - ))) + ])) ->setUsageType($keyDescriptor->getUse()) ; diff --git a/src/LightSaml/Store/Credential/StaticCredentialStore.php b/src/LightSaml/Store/Credential/StaticCredentialStore.php index a5fc9f18..a3fe7f0b 100644 --- a/src/LightSaml/Store/Credential/StaticCredentialStore.php +++ b/src/LightSaml/Store/Credential/StaticCredentialStore.php @@ -20,7 +20,7 @@ class StaticCredentialStore implements CredentialStoreInterface * * @var array */ - protected $credentials = array(); + protected $credentials = []; /** * @param string $entityId @@ -45,8 +45,6 @@ public function has($entityId) } /** - * @param CredentialInterface $credential - * * @return StaticCredentialStore */ public function add(CredentialInterface $credential) @@ -64,7 +62,7 @@ public function add(CredentialInterface $credential) private function checkEntityIdExistence($entityId) { if (false == $this->has($entityId)) { - $this->credentials[$entityId] = array(); + $this->credentials[$entityId] = []; } } } diff --git a/src/LightSaml/Store/Credential/X509FileCredentialStore.php b/src/LightSaml/Store/Credential/X509FileCredentialStore.php index beeafb8f..da28252f 100644 --- a/src/LightSaml/Store/Credential/X509FileCredentialStore.php +++ b/src/LightSaml/Store/Credential/X509FileCredentialStore.php @@ -12,9 +12,9 @@ namespace LightSaml\Store\Credential; use LightSaml\Credential\CredentialInterface; -use LightSaml\Credential\X509Credential; use LightSaml\Credential\KeyHelper; use LightSaml\Credential\X509Certificate; +use LightSaml\Credential\X509Credential; class X509FileCredentialStore implements CredentialStoreInterface { diff --git a/src/LightSaml/Store/EntityDescriptor/CompositeEntityDescriptorStore.php b/src/LightSaml/Store/EntityDescriptor/CompositeEntityDescriptorStore.php index efb569b5..c1a533a0 100644 --- a/src/LightSaml/Store/EntityDescriptor/CompositeEntityDescriptorStore.php +++ b/src/LightSaml/Store/EntityDescriptor/CompositeEntityDescriptorStore.php @@ -21,7 +21,7 @@ class CompositeEntityDescriptorStore implements EntityDescriptorStoreInterface /** * @param EntityDescriptorStoreInterface[] $stores */ - public function __construct(array $stores = array()) + public function __construct(array $stores = []) { foreach ($stores as $store) { $this->add($store); @@ -29,8 +29,6 @@ public function __construct(array $stores = array()) } /** - * @param EntityDescriptorStoreInterface $store - * * @return CompositeEntityDescriptorStore This instance */ public function add(EntityDescriptorStoreInterface $store) @@ -78,7 +76,7 @@ public function has($entityId) */ public function all() { - $result = array(); + $result = []; foreach ($this->children as $store) { $result = array_merge($result, $store->all()); } diff --git a/src/LightSaml/Store/EntityDescriptor/FixedEntityDescriptorStore.php b/src/LightSaml/Store/EntityDescriptor/FixedEntityDescriptorStore.php index c9a4e1a9..d39e8ce6 100644 --- a/src/LightSaml/Store/EntityDescriptor/FixedEntityDescriptorStore.php +++ b/src/LightSaml/Store/EntityDescriptor/FixedEntityDescriptorStore.php @@ -17,7 +17,7 @@ class FixedEntityDescriptorStore implements EntityDescriptorStoreInterface { /** @var array|EntityDescriptor[] entityId=>descriptor */ - protected $descriptors = array(); + protected $descriptors = []; /** * @param EntityDescriptor|EntitiesDescriptor $entityDescriptor diff --git a/src/LightSaml/Store/Id/IdArrayStore.php b/src/LightSaml/Store/Id/IdArrayStore.php index 4b2b9814..8a27f9f3 100644 --- a/src/LightSaml/Store/Id/IdArrayStore.php +++ b/src/LightSaml/Store/Id/IdArrayStore.php @@ -14,19 +14,18 @@ class IdArrayStore implements IdStoreInterface { /** @var array */ - protected $store = array(); + protected $store = []; /** - * @param string $entityId - * @param string $id - * @param \DateTime $expiryTime + * @param string $entityId + * @param string $id * * @return void */ public function set($entityId, $id, \DateTime $expiryTime) { if (false == isset($this->store[$entityId])) { - $this->store[$entityId] = array(); + $this->store[$entityId] = []; } $this->store[$entityId][$id] = $expiryTime; } diff --git a/src/LightSaml/Store/Id/IdStoreInterface.php b/src/LightSaml/Store/Id/IdStoreInterface.php index 943adccf..95a75ddb 100644 --- a/src/LightSaml/Store/Id/IdStoreInterface.php +++ b/src/LightSaml/Store/Id/IdStoreInterface.php @@ -14,9 +14,8 @@ interface IdStoreInterface { /** - * @param string $entityId - * @param string $id - * @param \DateTime $expiryTime + * @param string $entityId + * @param string $id * * @return void */ diff --git a/src/LightSaml/Store/Id/NullIdStore.php b/src/LightSaml/Store/Id/NullIdStore.php index fc111f92..567c26e0 100644 --- a/src/LightSaml/Store/Id/NullIdStore.php +++ b/src/LightSaml/Store/Id/NullIdStore.php @@ -14,9 +14,8 @@ class NullIdStore implements IdStoreInterface { /** - * @param string $entityId - * @param string $id - * @param \DateTime $expiryTime + * @param string $entityId + * @param string $id * * @return void */ diff --git a/src/LightSaml/Store/Request/AbstractRequestStateArrayStore.php b/src/LightSaml/Store/Request/AbstractRequestStateArrayStore.php index 6b1e9120..caddbc0a 100644 --- a/src/LightSaml/Store/Request/AbstractRequestStateArrayStore.php +++ b/src/LightSaml/Store/Request/AbstractRequestStateArrayStore.php @@ -16,8 +16,6 @@ abstract class AbstractRequestStateArrayStore implements RequestStateStoreInterface { /** - * @param RequestState $state - * * @return AbstractRequestStateArrayStore */ public function set(RequestState $state) @@ -39,7 +37,7 @@ public function get($id) $result = null; $arr = $this->getArray(); if (false == is_array($arr)) { - $arr = array(); + $arr = []; $this->setArray($arr); } if (isset($arr[$id])) { @@ -72,7 +70,7 @@ public function remove($id) */ public function clear() { - $this->setArray(array()); + $this->setArray([]); } /** @@ -81,8 +79,6 @@ public function clear() abstract protected function getArray(); /** - * @param array $arr - * * @return AbstractRequestStateArrayStore */ abstract protected function setArray(array $arr); diff --git a/src/LightSaml/Store/Request/RequestStateArrayStore.php b/src/LightSaml/Store/Request/RequestStateArrayStore.php index 005988b3..0a95f4dd 100644 --- a/src/LightSaml/Store/Request/RequestStateArrayStore.php +++ b/src/LightSaml/Store/Request/RequestStateArrayStore.php @@ -13,7 +13,7 @@ class RequestStateArrayStore extends AbstractRequestStateArrayStore { - private $arrayStore = array(); + private $arrayStore = []; /** * @return array @@ -24,8 +24,6 @@ protected function getArray() } /** - * @param array $arr - * * @return AbstractRequestStateArrayStore */ protected function setArray(array $arr) diff --git a/src/LightSaml/Store/Request/RequestStateSessionStore.php b/src/LightSaml/Store/Request/RequestStateSessionStore.php index 6fa5c018..6e0a1ffb 100644 --- a/src/LightSaml/Store/Request/RequestStateSessionStore.php +++ b/src/LightSaml/Store/Request/RequestStateSessionStore.php @@ -25,9 +25,8 @@ class RequestStateSessionStore extends AbstractRequestStateArrayStore protected $prefix; /** - * @param SessionInterface $session - * @param string $providerId - * @param string $prefix + * @param string $providerId + * @param string $prefix */ public function __construct(SessionInterface $session, $providerId, $prefix = 'saml_request_state_') { @@ -49,12 +48,10 @@ protected function getKey() */ protected function getArray() { - return $this->session->get($this->getKey(), array()); + return $this->session->get($this->getKey(), []); } /** - * @param array $arr - * * @return AbstractRequestStateArrayStore */ protected function setArray(array $arr) diff --git a/src/LightSaml/Store/Request/RequestStateStoreInterface.php b/src/LightSaml/Store/Request/RequestStateStoreInterface.php index c121b0c3..632f5b18 100644 --- a/src/LightSaml/Store/Request/RequestStateStoreInterface.php +++ b/src/LightSaml/Store/Request/RequestStateStoreInterface.php @@ -16,8 +16,6 @@ interface RequestStateStoreInterface { /** - * @param RequestState $state - * * @return RequestStateStoreInterface */ public function set(RequestState $state); diff --git a/src/LightSaml/Store/Sso/SsoStateFixedStore.php b/src/LightSaml/Store/Sso/SsoStateFixedStore.php index 51fd9bb5..737733fb 100644 --- a/src/LightSaml/Store/Sso/SsoStateFixedStore.php +++ b/src/LightSaml/Store/Sso/SsoStateFixedStore.php @@ -31,8 +31,6 @@ public function get() } /** - * @param SsoState $ssoState - * * @return void */ public function set(SsoState $ssoState) diff --git a/src/LightSaml/Store/Sso/SsoStateSessionStore.php b/src/LightSaml/Store/Sso/SsoStateSessionStore.php index 3ac5195d..e73b865c 100644 --- a/src/LightSaml/Store/Sso/SsoStateSessionStore.php +++ b/src/LightSaml/Store/Sso/SsoStateSessionStore.php @@ -23,8 +23,7 @@ class SsoStateSessionStore implements SsoStateStoreInterface protected $key; /** - * @param SessionInterface $session - * @param string $key + * @param string $key */ public function __construct(SessionInterface $session, $key) { @@ -47,8 +46,6 @@ public function get() } /** - * @param SsoState $ssoState - * * @return void */ public function set(SsoState $ssoState) diff --git a/src/LightSaml/Store/Sso/SsoStateStoreInterface.php b/src/LightSaml/Store/Sso/SsoStateStoreInterface.php index 9e6db6a4..868833d3 100644 --- a/src/LightSaml/Store/Sso/SsoStateStoreInterface.php +++ b/src/LightSaml/Store/Sso/SsoStateStoreInterface.php @@ -21,8 +21,6 @@ interface SsoStateStoreInterface public function get(); /** - * @param SsoState $ssoState - * * @return void */ public function set(SsoState $ssoState); diff --git a/src/LightSaml/Store/TrustOptions/CompositeTrustOptionsStore.php b/src/LightSaml/Store/TrustOptions/CompositeTrustOptionsStore.php index f78087f4..b594ef5c 100644 --- a/src/LightSaml/Store/TrustOptions/CompositeTrustOptionsStore.php +++ b/src/LightSaml/Store/TrustOptions/CompositeTrustOptionsStore.php @@ -21,7 +21,7 @@ class CompositeTrustOptionsStore implements TrustOptionsStoreInterface /** * @param TrustOptionsStoreInterface[] $stores */ - public function __construct(array $stores = array()) + public function __construct(array $stores = []) { foreach ($stores as $store) { $this->add($store); @@ -29,8 +29,6 @@ public function __construct(array $stores = array()) } /** - * @param TrustOptionsStoreInterface $store - * * @return CompositeTrustOptionsStore This instance */ public function add(TrustOptionsStoreInterface $store) diff --git a/src/LightSaml/Store/TrustOptions/FixedTrustOptionsStore.php b/src/LightSaml/Store/TrustOptions/FixedTrustOptionsStore.php index 1e414445..07230208 100644 --- a/src/LightSaml/Store/TrustOptions/FixedTrustOptionsStore.php +++ b/src/LightSaml/Store/TrustOptions/FixedTrustOptionsStore.php @@ -27,8 +27,6 @@ public function __construct(TrustOptions $option = null) } /** - * @param TrustOptions|null $trustOptions - * * @return FixedTrustOptionsStore */ public function setTrustOptions(TrustOptions $trustOptions = null) diff --git a/src/LightSaml/Store/TrustOptions/StaticTrustOptionsStore.php b/src/LightSaml/Store/TrustOptions/StaticTrustOptionsStore.php index ac440621..40096ac8 100644 --- a/src/LightSaml/Store/TrustOptions/StaticTrustOptionsStore.php +++ b/src/LightSaml/Store/TrustOptions/StaticTrustOptionsStore.php @@ -16,11 +16,10 @@ class StaticTrustOptionsStore implements TrustOptionsStoreInterface { /** @var TrustOptions[] */ - protected $options = array(); + protected $options = []; /** - * @param string $entityId - * @param TrustOptions $options + * @param string $entityId * * @return StaticTrustOptionsStore */ diff --git a/src/LightSaml/Validator/Model/Assertion/AssertionTimeValidator.php b/src/LightSaml/Validator/Model/Assertion/AssertionTimeValidator.php index 90273cd7..182522ba 100644 --- a/src/LightSaml/Validator/Model/Assertion/AssertionTimeValidator.php +++ b/src/LightSaml/Validator/Model/Assertion/AssertionTimeValidator.php @@ -18,9 +18,8 @@ class AssertionTimeValidator implements AssertionTimeValidatorInterface { /** - * @param Assertion $assertion - * @param int $now - * @param int $allowedSecondsSkew + * @param int $now + * @param int $allowedSecondsSkew * * @throws \LightSaml\Error\LightSamlValidationException * @@ -38,9 +37,8 @@ public function validateTimeRestrictions(Assertion $assertion, $now, $allowedSec } /** - * @param Assertion $assertion - * @param int $now - * @param int $allowedSecondsSkew + * @param int $now + * @param int $allowedSecondsSkew */ protected function validateConditions(Assertion $assertion, $now, $allowedSecondsSkew) { @@ -58,9 +56,8 @@ protected function validateConditions(Assertion $assertion, $now, $allowedSecond } /** - * @param Assertion $assertion - * @param int $now - * @param int $allowedSecondsSkew + * @param int $now + * @param int $allowedSecondsSkew */ protected function validateAuthnStatements(Assertion $assertion, $now, $allowedSecondsSkew) { @@ -77,9 +74,8 @@ protected function validateAuthnStatements(Assertion $assertion, $now, $allowedS } /** - * @param Assertion $assertion - * @param int $now - * @param int $allowedSecondsSkew + * @param int $now + * @param int $allowedSecondsSkew */ protected function validateSubject(Assertion $assertion, $now, $allowedSecondsSkew) { diff --git a/src/LightSaml/Validator/Model/Assertion/AssertionTimeValidatorInterface.php b/src/LightSaml/Validator/Model/Assertion/AssertionTimeValidatorInterface.php index fc5965c8..c98d08e0 100644 --- a/src/LightSaml/Validator/Model/Assertion/AssertionTimeValidatorInterface.php +++ b/src/LightSaml/Validator/Model/Assertion/AssertionTimeValidatorInterface.php @@ -16,9 +16,8 @@ interface AssertionTimeValidatorInterface { /** - * @param Assertion $assertion - * @param int $now - * @param int $allowedSecondsSkew + * @param int $now + * @param int $allowedSecondsSkew * * @throws \LightSaml\Error\LightSamlValidationException * diff --git a/src/LightSaml/Validator/Model/Assertion/AssertionValidator.php b/src/LightSaml/Validator/Model/Assertion/AssertionValidator.php index 03b7a467..31ad2415 100644 --- a/src/LightSaml/Validator/Model/Assertion/AssertionValidator.php +++ b/src/LightSaml/Validator/Model/Assertion/AssertionValidator.php @@ -36,11 +36,6 @@ class AssertionValidator implements AssertionValidatorInterface /** @var StatementValidatorInterface */ protected $statementValidator; - /** - * @param NameIdValidatorInterface $nameIdValidator - * @param SubjectValidatorInterface $subjectValidator - * @param StatementValidatorInterface $statementValidator - */ public function __construct( NameIdValidatorInterface $nameIdValidator, SubjectValidatorInterface $subjectValidator, @@ -52,8 +47,6 @@ public function __construct( } /** - * @param Assertion $assertion - * * @return void */ public function validateAssertion(Assertion $assertion) @@ -65,8 +58,6 @@ public function validateAssertion(Assertion $assertion) } /** - * @param Assertion $assertion - * * @throws LightSamlValidationException */ protected function validateAssertionAttributes(Assertion $assertion) @@ -93,8 +84,6 @@ protected function validateAssertionAttributes(Assertion $assertion) } /** - * @param Assertion $assertion - * * @throws LightSamlValidationException */ protected function validateSubject(Assertion $assertion) @@ -153,8 +142,6 @@ protected function validateConditionsInterval(Conditions $conditions) } /** - * @param ProxyRestriction $item - * * @throws LightSamlValidationException */ protected function validateProxyRestriction(ProxyRestriction $item) @@ -173,8 +160,6 @@ protected function validateProxyRestriction(ProxyRestriction $item) } /** - * @param AudienceRestriction $item - * * @throws LightSamlValidationException */ protected function validateAudienceRestriction(AudienceRestriction $item) @@ -190,9 +175,6 @@ protected function validateAudienceRestriction(AudienceRestriction $item) } } - /** - * @param Assertion $assertion - */ protected function validateStatements(Assertion $assertion) { if (false == $assertion->getAllItems()) { diff --git a/src/LightSaml/Validator/Model/Assertion/AssertionValidatorInterface.php b/src/LightSaml/Validator/Model/Assertion/AssertionValidatorInterface.php index 865a9d2d..0dc2f6ef 100644 --- a/src/LightSaml/Validator/Model/Assertion/AssertionValidatorInterface.php +++ b/src/LightSaml/Validator/Model/Assertion/AssertionValidatorInterface.php @@ -16,8 +16,6 @@ interface AssertionValidatorInterface { /** - * @param Assertion $assertion - * * @throws \LightSaml\Error\LightSamlValidationException * * @return void diff --git a/src/LightSaml/Validator/Model/NameId/NameIdValidator.php b/src/LightSaml/Validator/Model/NameId/NameIdValidator.php index 73e6db90..19013753 100644 --- a/src/LightSaml/Validator/Model/NameId/NameIdValidator.php +++ b/src/LightSaml/Validator/Model/NameId/NameIdValidator.php @@ -18,7 +18,7 @@ class NameIdValidator implements NameIdValidatorInterface { - private static $formatValidators = array( + private static $formatValidators = [ SamlConstants::NAME_ID_FORMAT_EMAIL => 'validateEmailFormat', SamlConstants::NAME_ID_FORMAT_X509_SUBJECT_NAME => 'validateX509SubjectNameFormat', SamlConstants::NAME_ID_FORMAT_WINDOWS => 'validateWindowsFormat', @@ -26,11 +26,9 @@ class NameIdValidator implements NameIdValidatorInterface SamlConstants::NAME_ID_FORMAT_ENTITY => 'validateEntityFormat', SamlConstants::NAME_ID_FORMAT_PERSISTENT => 'validatePersistentFormat', SamlConstants::NAME_ID_FORMAT_TRANSIENT => 'validateTransientFormat', - ); + ]; /** - * @param AbstractNameID $nameId - * * @throws \LightSaml\Error\LightSamlValidationException * * @return void @@ -50,24 +48,13 @@ public function validateNameId(AbstractNameID $nameId) } } - /** - * @param AbstractNameID $nameId - */ protected function validateFormat(AbstractNameID $nameId) { if (false == Helper::validateWellFormedUriString($nameId->getFormat())) { - throw new LightSamlValidationException( - sprintf( - "NameID element has Format attribute '%s' which is not a wellformed absolute uri", - $nameId->getFormat() - ) - ); + throw new LightSamlValidationException(sprintf("NameID element has Format attribute '%s' which is not a wellformed absolute uri", $nameId->getFormat())); } } - /** - * @param AbstractNameID $nameId - */ protected function validateEmailFormat(AbstractNameID $nameId) { if (false == Helper::validateRequiredString($nameId->getValue())) { @@ -79,9 +66,6 @@ protected function validateEmailFormat(AbstractNameID $nameId) } } - /** - * @param AbstractNameID $nameId - */ protected function validateX509SubjectNameFormat(AbstractNameID $nameId) { if (false == Helper::validateRequiredString($nameId->getValue())) { @@ -92,9 +76,6 @@ protected function validateX509SubjectNameFormat(AbstractNameID $nameId) // XML Signature Recommendation (http://www.w3.org/TR/xmldsig-core/) section 4.4.4 } - /** - * @param AbstractNameID $nameId - */ protected function validateWindowsFormat(AbstractNameID $nameId) { // Required format is 'DomainName\UserName' but the domain name and the '\' are optional @@ -103,9 +84,6 @@ protected function validateWindowsFormat(AbstractNameID $nameId) } } - /** - * @param AbstractNameID $nameId - */ protected function validateKerberosFormat(AbstractNameID $nameId) { // Required format is 'name[/instance]@REALM' @@ -121,9 +99,6 @@ protected function validateKerberosFormat(AbstractNameID $nameId) // TODO: Consider implementing the rules for 'name', 'instance' and 'REALM' found in IETF RFC 1510 (http://www.ietf.org/rfc/rfc1510.txt) here } - /** - * @param AbstractNameID $nameId - */ protected function validateEntityFormat(AbstractNameID $nameId) { if (false == Helper::validateRequiredString($nameId->getValue())) { @@ -143,9 +118,6 @@ protected function validateEntityFormat(AbstractNameID $nameId) } } - /** - * @param AbstractNameID $nameId - */ protected function validatePersistentFormat(AbstractNameID $nameId) { if (false == Helper::validateRequiredString($nameId->getValue())) { @@ -156,9 +128,6 @@ protected function validatePersistentFormat(AbstractNameID $nameId) } } - /** - * @param AbstractNameID $nameId - */ protected function validateTransientFormat(AbstractNameID $nameId) { if (false == Helper::validateRequiredString($nameId->getValue())) { @@ -168,12 +137,7 @@ protected function validateTransientFormat(AbstractNameID $nameId) throw new LightSamlValidationException('NameID with Transient Format attribute MUST have a Value that contains no more than 256 characters'); } if (false == Helper::validateIdString($nameId->getValue())) { - throw new LightSamlValidationException( - sprintf( - "NameID '%s' with Transient Format attribute MUST have a Value with at least 16 characters (the equivalent of 128 bits)", - $nameId->getValue() - ) - ); + throw new LightSamlValidationException(sprintf("NameID '%s' with Transient Format attribute MUST have a Value with at least 16 characters (the equivalent of 128 bits)", $nameId->getValue())); } } } diff --git a/src/LightSaml/Validator/Model/NameId/NameIdValidatorInterface.php b/src/LightSaml/Validator/Model/NameId/NameIdValidatorInterface.php index 2c433684..af02b68c 100644 --- a/src/LightSaml/Validator/Model/NameId/NameIdValidatorInterface.php +++ b/src/LightSaml/Validator/Model/NameId/NameIdValidatorInterface.php @@ -16,8 +16,6 @@ interface NameIdValidatorInterface { /** - * @param AbstractNameID $nameId - * * @return void */ public function validateNameId(AbstractNameID $nameId); diff --git a/src/LightSaml/Validator/Model/Signature/SignatureValidator.php b/src/LightSaml/Validator/Model/Signature/SignatureValidator.php index d4585264..bc8fd386 100644 --- a/src/LightSaml/Validator/Model/Signature/SignatureValidator.php +++ b/src/LightSaml/Validator/Model/Signature/SignatureValidator.php @@ -12,33 +12,29 @@ namespace LightSaml\Validator\Model\Signature; use LightSaml\Credential\CredentialInterface; +use LightSaml\Credential\Criteria\EntityIdCriteria; +use LightSaml\Credential\Criteria\MetadataCriteria; use LightSaml\Credential\Criteria\PublicKeyThumbprintCriteria; +use LightSaml\Credential\Criteria\UsageCriteria; +use LightSaml\Credential\UsageType; use LightSaml\Error\LightSamlSecurityException; use LightSaml\Model\XmlDSig\AbstractSignatureReader; use LightSaml\Resolver\Credential\CredentialResolverInterface; use LightSaml\SamlConstants; -use LightSaml\Credential\UsageType; -use LightSaml\Credential\Criteria\EntityIdCriteria; -use LightSaml\Credential\Criteria\MetadataCriteria; -use LightSaml\Credential\Criteria\UsageCriteria; class SignatureValidator implements SignatureValidatorInterface { /** @var CredentialResolverInterface */ protected $credentialResolver; - /** - * @param CredentialResolverInterface $credentialResolver - */ public function __construct(CredentialResolverInterface $credentialResolver) { $this->credentialResolver = $credentialResolver; } /** - * @param AbstractSignatureReader $signature - * @param string $issuer - * @param string $metadataType + * @param string $issuer + * @param string $metadataType * * @return CredentialInterface|null */ diff --git a/src/LightSaml/Validator/Model/Signature/SignatureValidatorInterface.php b/src/LightSaml/Validator/Model/Signature/SignatureValidatorInterface.php index 3cc03602..d4a0f5b3 100644 --- a/src/LightSaml/Validator/Model/Signature/SignatureValidatorInterface.php +++ b/src/LightSaml/Validator/Model/Signature/SignatureValidatorInterface.php @@ -17,9 +17,8 @@ interface SignatureValidatorInterface { /** - * @param AbstractSignatureReader $signature - * @param string $issuer - * @param string $metadataType + * @param string $issuer + * @param string $metadataType * * @return CredentialInterface|null */ diff --git a/src/LightSaml/Validator/Model/Statement/StatementValidator.php b/src/LightSaml/Validator/Model/Statement/StatementValidator.php index f2a102cb..9ff21a61 100644 --- a/src/LightSaml/Validator/Model/Statement/StatementValidator.php +++ b/src/LightSaml/Validator/Model/Statement/StatementValidator.php @@ -22,8 +22,6 @@ class StatementValidator implements StatementValidatorInterface { /** - * @param AbstractStatement $statement - * * @throws \LightSaml\Error\LightSamlValidationException * * @return void @@ -101,8 +99,6 @@ private function validateAttributeStatement(AttributeStatement $statement) } /** - * @param Attribute $attribute - * * @throws LightSamlValidationException * * @return void diff --git a/src/LightSaml/Validator/Model/Statement/StatementValidatorInterface.php b/src/LightSaml/Validator/Model/Statement/StatementValidatorInterface.php index a0f280c8..d6533550 100644 --- a/src/LightSaml/Validator/Model/Statement/StatementValidatorInterface.php +++ b/src/LightSaml/Validator/Model/Statement/StatementValidatorInterface.php @@ -16,8 +16,6 @@ interface StatementValidatorInterface { /** - * @param AbstractStatement $statement - * * @return void */ public function validateStatement(AbstractStatement $statement); diff --git a/src/LightSaml/Validator/Model/Subject/SubjectValidator.php b/src/LightSaml/Validator/Model/Subject/SubjectValidator.php index 2c55f814..761c904d 100644 --- a/src/LightSaml/Validator/Model/Subject/SubjectValidator.php +++ b/src/LightSaml/Validator/Model/Subject/SubjectValidator.php @@ -23,17 +23,12 @@ class SubjectValidator implements SubjectValidatorInterface /** @var NameIdValidatorInterface */ protected $nameIdValidator; - /** - * @param NameIdValidatorInterface $nameIdValidator - */ public function __construct(NameIdValidatorInterface $nameIdValidator) { $this->nameIdValidator = $nameIdValidator; } /** - * @param Subject $subject - * * @throws LightSamlValidationException * * @return void @@ -56,8 +51,6 @@ public function validateSubject(Subject $subject) } /** - * @param SubjectConfirmation $subjectConfirmation - * * @throws \LightSaml\Error\LightSamlValidationException */ protected function validateSubjectConfirmation(SubjectConfirmation $subjectConfirmation) diff --git a/src/LightSaml/Validator/Model/Subject/SubjectValidatorInterface.php b/src/LightSaml/Validator/Model/Subject/SubjectValidatorInterface.php index e7a89ba7..978f867b 100644 --- a/src/LightSaml/Validator/Model/Subject/SubjectValidatorInterface.php +++ b/src/LightSaml/Validator/Model/Subject/SubjectValidatorInterface.php @@ -16,8 +16,6 @@ interface SubjectValidatorInterface { /** - * @param Subject $subject - * * @return void */ public function validateSubject(Subject $subject); diff --git a/src/LightSaml/Validator/Model/Xsd/XsdError.php b/src/LightSaml/Validator/Model/Xsd/XsdError.php index 3c57b289..fcef033d 100644 --- a/src/LightSaml/Validator/Model/Xsd/XsdError.php +++ b/src/LightSaml/Validator/Model/Xsd/XsdError.php @@ -39,8 +39,6 @@ class XsdError private $column; /** - * @param \LibXMLError $error - * * @return XsdError */ public static function fromLibXMLError(\LibXMLError $error)