Add enqueue and alpine (#7)

Add enqueue and alpine

Author: dzubchik

.env.dist

@@ -7,10 +7,6 @@ DATABASE_NAME=webhooks
 DATABASE_USER=webhooks
 DATABASE_PASSWORD=webhooks
 
-RABBITMQ_HOST=rabbit
-RABBITMQ_PORT=5672
-RABBITMQ_USER=guest
-RABBITMQ_PASSWORD=guest
-RABBITMQ_VIRTUAL_HOST=/
+RABBITMQ_DSN=amqp://guest:guest@rabbit:5672/
 
 SYMFONY_SECRET=yHSmQvobci6RyGVRRCZDYzEqVCpvnMkI+i59buP8PwI=

.travis.yml

@@ -6,16 +6,16 @@ language: php
 
 cache:
     - vendor
+
 php:
-    - '7.0'
     - '7.1'
 
 before_script:
-  - composer install -o
+  - composer install -o --ignore-platform-reqs
 
 after_script:
     - |
-      if [ $TRAVIS_PHP_VERSION = '7.0' ]; then
+      if [ $TRAVIS_PHP_VERSION = '7.1' ]; then
         travis_retry wget https://scrutinizer-ci.com/ocular.phar
         php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
       fi
@@ -26,4 +26,4 @@ install:
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - travis_retry composer self-update && composer --version
 
-script: phpunit --configuration phpunit.xml
+script: phpunit --configuration phpunit.xml

app/AppKernel.php

@@ -14,14 +14,18 @@ public function registerBundles()
             new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Webhook\Bundle\WebhookBundle(),
+
+            /** Third party bundles */
             new Nelmio\CorsBundle\NelmioCorsBundle(),
+            new Enqueue\Bundle\EnqueueBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+            $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
         }
 
         return $bundles;

app/config/config.yml

@@ -62,3 +62,12 @@ nelmio_cors:
             allow_headers: "*"
             allow_methods: ['PATCH', 'POST', 'PUT', 'GET', 'DELETE', 'OPTIONS']
             max_age: 3600
+
+enqueue:
+    client:
+        app_name: "webhooks"
+    transport:
+        default: 'rabbitmq_amqp'
+        rabbitmq_amqp:
+            dsn: '%rabbitmq_dsn%'
+            delay_strategy: 'dlx'

app/config/config_dev.yml

@@ -5,7 +5,11 @@ framework:
     router:
         resource: '%kernel.root_dir%/config/routing_dev.yml'
         strict_requirements: true
-
+        
+enqueue:
+    client:
+        traceable_producer: true
+        
 monolog:
     handlers:
         main:

app/config/parameters.yml.dist

@@ -10,8 +10,4 @@ parameters:
 
     secret: "%env(SYMFONY_SECRET)%"
 
-    rabbitmq_host: "%env(RABBITMQ_HOST)%"
-    rabbitmq_port: "%env(RABBITMQ_PORT)%"
-    rabbitmq_user: "%env(RABBITMQ_USER)%"
-    rabbitmq_password: "%env(RABBITMQ_PASSWORD)%"
-    rabbitmq_virtual_host: "%env(RABBITMQ_VIRTUAL_HOST)%"
+    rabbitmq_dsn: "%env(RABBITMQ_DSN)%"

bin/symfony_requirements

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require_once dirname(__FILE__).'/./SymfonyRequirements.php';
+require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
 
 $lineSize = 70;
 $symfonyRequirements = new SymfonyRequirements();

composer.json

@@ -1,7 +1,6 @@
 {
   "require": {
-    "php": ">=7.0",
-    "bunny/bunny": "^0.2.4",
+    "php": ">=7.1",
     "doctrine/doctrine-bundle": "^1.6",
     "doctrine/doctrine-cache-bundle": "^1.2",
     "doctrine/orm": "^2.5",
@@ -13,10 +12,18 @@
     "php-http/message": "^1.5",
     "ramsey/uuid": "^3.5",
     "sensio/distribution-bundle": "^5.0",
-    "symfony/monolog-bundle": "^3.0.2",
-    "symfony/polyfill-apcu": "^1.0",
+    "sensio/framework-extra-bundle": "^3.0",
+    "symfony/monolog-bundle": "^3.0",
     "symfony/symfony": "^3.3",
-    "twig/twig": "^1.0||^2.0"
+    "symfony/polyfill-apcu": "^1.0",
+    "enqueue/enqueue-bundle": "^0.7",
+    "enqueue/amqp-ext": "^0.7",
+    "php-amqplib/php-amqplib": "^2.6",
+    "enqueue/enqueue": "^0.7",
+    "twig/twig": "^1.0||^2.0",
+    "php-pm/php-pm": "dev-master",
+    "php-pm/httpkernel-adapter": "dev-master",
+    "react/http": "dev-master#cd15204bd15d106d7832c680e4fb0ca0ce2f5e30"
   },
   "autoload": {
     "psr-4": {
@@ -55,12 +62,6 @@
       "@symfony-scripts"
     ]
   },
-  "config": {
-    "platform": {
-      "php": "7.0"
-    },
-    "sort-packages": true
-  },
   "extra": {
     "symfony-app-dir": "app",
     "symfony-bin-dir": "bin",
@@ -70,6 +71,9 @@
     "symfony-assets-install": "relative",
     "incenteev-parameters": {
       "file": "app/config/parameters.yml"
+    },
+    "branch-alias": {
+      "dev-master": "3.2-dev"
     }
   }
 }