Merge pull request #10 from TheDMSGroup/dev-custom

Locking down composer.lock for the sake of upstream dependency changes.

.ebextensions/00_compliance.config

@@ -1,11 +1,12 @@
 # Configuration suggestions for HIPAA/PCI compliance.
 
-Resources:
-  AWSEBAutoScalingLaunchConfiguration:
-    Type: AWS::AutoScaling::LaunchConfiguration
-    Properties:
-      # For HIPAA compliance.
-      PlacementTenancy: "dedicated"
+# Uncomment if you need to enforce dedicated tennancy for all environments.
+# Resources:
+#   AWSEBAutoScalingLaunchConfiguration:
+#     Type: AWS::AutoScaling::LaunchConfiguration
+#     Properties:
+#       # For HIPAA compliance.
+#       PlacementTenancy: "dedicated"
 
 option_settings:
   aws:elasticbeanstalk:cloudwatch:logs:

.ebextensions/70_mautic.config

@@ -12,9 +12,12 @@ container_commands:
   72_mautic_migrations:
     command: console doctrine:migrations:migrate --no-interaction -vvv
     leader_only: true
+  73_mautic_schema:
+    command: console doctrine:schema:update --force -vvv
+    leader_only: true
   # Download IP Lookup databases, which are stored in each instance and not on the EFS mount.
-  73_mautic_iplookup:
+  74_mautic_iplookup:
     command: console mautic:iplookup:download -vvv
   # Promote new changes to core CSS and JS. This assumes LESS compilation has taken place at build-time.
-  74_generate_assets:
+  75_generate_assets:
     command: console mautic:assets:generate -vvv

.travis.yml

@@ -1,4 +1,4 @@
-dist: precise
+dist: trusty
 
 language: php
 
@@ -25,7 +25,7 @@ before_install:
   - if [[ ${TRAVIS_PHP_VERSION:0:3} != "5.6" ]]; then composer global require phpstan/phpstan-shim:0.8.5; fi
 
   # Install custom dependencies if on the custom branches.
-  - if [ "$TRAVIS_BRANCH" = *"custom"* ]; then rm -rf composer.lock; cp composer.custom.dist composer.custom; fi
+  - if [[ "$TRAVIS_BRANCH" = *"custom"* ]]; then cp composer.lock.dist composer.lock; cp composer.custom.dist composer.custom; fi
 
   # Include optional custom composer dependencies.
   - bash ./scripts/composer-custom.sh

composer.custom.dist

@@ -3,9 +3,16 @@
       "thedmsgroup/mautic-eb-custom": "dev-master",
       "thedmsgroup/mautic-extended-field-bundle": "dev-master",
       "thedmsgroup/mautic-contact-client-bundle": "dev-master",
+      "thedmsgroup/mautic-contact-ledger-bundle": "dev-master",
       "thedmsgroup/mautic-contact-source-bundle": "dev-master",
       "thedmsgroup/mautic-enhancer-bundle": "dev-master"
     },
+    "config": {
+        "preferred-install": {
+            "*": "dist",
+            "thedmsgroup/*": "source"
+        }
+    },
     "repositories": [
       {
         "type": "package",