Merge pull request #2 from cb8/project-setup

Fix project setup
lightSAML · Dec 6, 2015 · 02ad34a · 02ad34a
2 parents 5f284fc + 07d122f
commit 02ad34a
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 43 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,21 @@ language: php
 php:
     - 5.5
     - 5.6
+    - 7.0
+    - hhvm
 
-before_script:
+matrix:
+    include:
+        - php: 5.5
+          env: COMPOSER_FLAGS="--prefer-lowest"
+
+before_install:
     - composer self-update
     - composer --version
     - wget http://get.sensiolabs.org/php-cs-fixer.phar -O php-cs-fixer.phar
-    - COMPOSER_ROOT_VERSION=dev-master composer install
+
+install:
+    - COMPOSER_ROOT_VERSION=dev-master composer update --prefer-source $COMPOSER_FLAGS
 
 script:
     - php php-cs-fixer.phar fix --dry-run -v

diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@ LightSAML Symfony Bridge Bundle
 [![License](https://img.shields.io/packagist/l/lightsaml/symfony-bridge.svg)](https://packagist.org/packages/lightsaml/symfony-bridge)
 [![Build Status](https://travis-ci.org/lightSAML/SymfonyBridgeBundle.svg?branch=master)](https://travis-ci.org/lightSAML/SymfonyBridgeBundle)
 [![Coverage Status](https://coveralls.io/repos/lightSAML/SymfonyBridgeBundle/badge.svg?branch=master&service=github)](https://coveralls.io/github/lightSAML/SymfonyBridgeBundle?branch=master)
+[![HHVM Status](http://hhvm.h4cc.de/badge/lightsaml/symfony-bridge.svg?style=flat)](http://hhvm.h4cc.de/package/lightsaml/symfony-bridge)
 
 LightSAML Symfony Bridge Bundle implements LightSAML build container bridge to the Symfony container.
 
diff --git a/composer.json b/composer.json
@@ -11,7 +11,9 @@
     },
     "require": {
         "php": ">=5.5.1",
-        "symfony/framework-bundle": "~2.3",
+        "symfony/framework-bundle": "~2.6",
+        "symfony/dependency-injection": "~2.6",
+        "symfony/yaml": "~2.3",
         "lightSAML/lightSAML": "dev-master"
     },
     "require-dev": {
@@ -21,13 +23,6 @@
     "suggest": {
         "lightsaml/lightsamp-idp": "If you will be using IDP LightSAML services"
     },
-    "scripts": {
-        "post-install-cmd": [
-            "bash contrib/setup.sh"
-        ],
-        "post-update-cmd": [
-        ]
-    },
     "config": {
         "bin-dir": "bin"
     },

diff --git a/src/LightSaml/SymfonyBridgeBundle/Resources/config/container.yml b/src/LightSaml/SymfonyBridgeBundle/Resources/config/container.yml
@@ -2,4 +2,4 @@ services:
     lightsaml.container.build:
         class: LightSaml\SymfonyBridgeBundle\Bridge\Container\BuildContainer
         arguments:
-            - @service_container
+            - "@service_container"
diff --git a/src/LightSaml/SymfonyBridgeBundle/Resources/config/credential.yml b/src/LightSaml/SymfonyBridgeBundle/Resources/config/credential.yml
@@ -3,10 +3,10 @@ services:
         class: LightSaml\Store\Credential\CompositeCredentialStore
         factory: [LightSaml\SymfonyBridgeBundle\Factory\CredentialStoreFactory, build]
         arguments:
-            - @lightsaml.party.idp_entity_descriptor_store
-            - @lightsaml.party.sp_entity_descriptor_store
-            - %lightsaml.own.entity_id%
-            - @lightsaml.own.credential_store
+            - "@lightsaml.party.idp_entity_descriptor_store"
+            - "@lightsaml.party.sp_entity_descriptor_store"
+            - "%lightsaml.own.entity_id%"
+            - "@lightsaml.own.credential_store"
             - []
 
     lightsaml.credential.credential_store_factory:

diff --git a/src/LightSaml/SymfonyBridgeBundle/Resources/config/own.yml b/src/LightSaml/SymfonyBridgeBundle/Resources/config/own.yml
@@ -10,8 +10,8 @@ services:
         class: LightSaml\Builder\EntityDescriptor\SimpleEntityDescriptorBuilder
         factory: [LightSaml\SymfonyBridgeBundle\Factory\OwnEntityDescriptorProviderFactory, build]
         arguments:
-            - %lightsaml.own.entity_id%
-            - @router
-            - %lightsaml.route.login_check%
+            - "%lightsaml.own.entity_id%"
+            - "@router"
+            - "%lightsaml.route.login_check%"
             - ~
-            - @lightsaml.own.credential_store
+            - "@lightsaml.own.credential_store"
diff --git a/src/LightSaml/SymfonyBridgeBundle/Resources/config/profile.yml b/src/LightSaml/SymfonyBridgeBundle/Resources/config/profile.yml
@@ -2,14 +2,14 @@ services:
     ligthsaml.profile.metadata:
         class: LightSaml\Builder\Profile\Metadata\MetadataProfileBuilder
         arguments:
-            - @lightsaml.container.build
+            - "@lightsaml.container.build"
 
     ligthsaml.profile.login_factory:
         class: LightSaml\Builder\Profile\WebBrowserSso\Sp\SsoSpSendAuthnRequestProfileBuilderFactory
         arguments:
-            - @lightsaml.container.build
+            - "@lightsaml.container.build"
 
     ligthsaml.profile.acs:
         class: LightSaml\Builder\Profile\WebBrowserSso\Sp\SsoSpReceiveResponseProfileBuilder
         arguments:
-            - @lightsaml.container.build
+            - "@lightsaml.container.build"
diff --git a/src/LightSaml/SymfonyBridgeBundle/Resources/config/service.yml b/src/LightSaml/SymfonyBridgeBundle/Resources/config/service.yml
@@ -8,17 +8,17 @@ services:
     lightsaml.service.subject_validator:
         class: LightSaml\Validator\Model\Subject\SubjectValidator
         arguments:
-            - @lightsaml.service.name_id_validator
+            - "@lightsaml.service.name_id_validator"
 
     lightsaml.service.assertion_time_validator:
         class: LightSaml\Validator\Model\Assertion\AssertionTimeValidator
 
     lightsaml.service.assertion_validator:
         class: LightSaml\Validator\Model\Assertion\AssertionValidator
         arguments:
-            - @lightsaml.service.name_id_validator
-            - @lightsaml.service.subject_validator
-            - @lightsaml.service.statement_validator
+            - "@lightsaml.service.name_id_validator"
+            - "@lightsaml.service.subject_validator"
+            - "@lightsaml.service.statement_validator"
 
     lightsaml.service.endpoint_resolver.binding:
         class: LightSaml\Resolver\Endpoint\BindingEndpointResolver
@@ -38,38 +38,38 @@ services:
     lightsaml.service.endpoint_resolver:
         class: LightSaml\Resolver\Endpoint\CompositeEndpointResolver
         calls:
-            - [add, [@lightsaml.service.endpoint_resolver.binding]]
-            - [add, [@lightsaml.service.endpoint_resolver.descriptor_type]]
-            - [add, [@lightsaml.service.endpoint_resolver.service_type]]
-            - [add, [@lightsaml.service.endpoint_resolver.index]]
-            - [add, [@lightsaml.service.endpoint_resolver.location]]
+            - [add, ["@lightsaml.service.endpoint_resolver.binding"]]
+            - [add, ["@lightsaml.service.endpoint_resolver.descriptor_type"]]
+            - [add, ["@lightsaml.service.endpoint_resolver.service_type"]]
+            - [add, ["@lightsaml.service.endpoint_resolver.index"]]
+            - [add, ["@lightsaml.service.endpoint_resolver.location"]]
 
     lightsaml.service.binding_factory:
         class: LightSaml\Binding\BindingFactory
         arguments:
-            - @lightsaml.system.event_dispatcher
+            - "@lightsaml.system.event_dispatcher"
 
     lightsaml.service.credential_resolver_factory:
         class: LightSaml\Resolver\Credential\Factory\CredentialResolverFactory
         arguments:
-            - @lightsaml.credential.credential_store
+            - "@lightsaml.credential.credential_store"
 
     lightsaml.service.credential_resolver:
         class: LightSaml\Resolver\Credential\CompositeFilterResolver
-        factory: [@lightsaml.service.credential_resolver_factory, build]
+        factory: ["@lightsaml.service.credential_resolver_factory", build]
 
     lightsaml.service.signature_resolver:
         class: LightSaml\Resolver\Signature\OwnSignatureResolver
         arguments:
-            - @lightsaml.service.credential_resolver
+            - "@lightsaml.service.credential_resolver"
 
     lightsaml.service.signature_validator:
         class: LightSaml\Validator\Model\Signature\SignatureValidator
         arguments:
-            - @lightsaml.service.credential_resolver
+            - "@lightsaml.service.credential_resolver"
 
     lightsaml.service.session_processor:
         class: LightSaml\Resolver\Session\SessionProcessor
         arguments:
-            - @lightsaml.store.sso_state
-            - @lightsaml.system.time_provider
+            - "@lightsaml.store.sso_state"
+            - "@lightsaml.system.time_provider"
diff --git a/src/LightSaml/SymfonyBridgeBundle/Resources/config/store.yml b/src/LightSaml/SymfonyBridgeBundle/Resources/config/store.yml
@@ -7,15 +7,15 @@ services:
     lightsaml.store.request:
         class: LightSaml\Store\Request\RequestStateSessionStore
         arguments:
-            - @session
-            - %lightsaml.store.request_session_prefix%
-            - %lightsaml.store.request_session_sufix%
+            - "@session"
+            - "%lightsaml.store.request_session_prefix%"
+            - "%lightsaml.store.request_session_sufix%"
 
     lightsaml.store.id_state:
         class: LightSaml\Store\Id\NullIdStore
 
     lightsaml.store.sso_state:
         class: LightSaml\Store\Sso\SsoStateSessionStore
         arguments:
-            - @session
-            - lightsaml.store.sso_state_session_key
+            - "@session"
+            - "%lightsaml.store.sso_state_session_key%"