Testing

Author: Pavel Batanov

.travis.yml

@@ -0,0 +1,37 @@
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+env:
+  - SYMFONY_VERSION='2.3.*' deps='no'
+  - SYMFONY_VERSION='2.5.*' deps='no'
+  - SYMFONY_VERSION='2.6.*' deps='no'
+  - SYMFONY_VERSION='2.7.*@dev' deps='no'
+
+matrix:
+    include:
+      - php: 5.5
+        env: SYMFONY_VERSION='~2.8@dev' deps='no'
+      - php: 5.5
+        env: SYMFONY_VERSION='~2.8|~3.0@dev' deps='no'
+      - php: 5.4
+        env: SYMFONY_VERSION='2.3.*' deps='low'
+
+    allow_failures:
+        - php: hhvm
+
+before_install:
+  - travis_retry composer self-update
+
+install:
+    - composer require --no-update symfony/symfony=${SYMFONY_VERSION}
+    - if [ "$deps" = "no" ]; then composer --prefer-source install; fi;
+    - if [ "$deps" = "low" ]; then composer --prefer-source --prefer-lowest --prefer-stable update; fi;
+
+script:
+  - mkdir -p build
+  - phpunit --colors -c phpunit.xml --coverage-text

composer.json

@@ -22,7 +22,7 @@
     },
     "autoload": {
         "psr-0": {
-            "ScayTrase\\Utils\\SMSDeliveryBundle": "src/"
+            "": "src/"
         }
     }
 }

src/ScayTrase/SmsDeliveryBundle/DataCollector/MessageDeliveryDataCollector.php

@@ -43,7 +43,7 @@ public function getName()
 
     public function putMessageInfo(array $data)
     {
-        $this->data['messages'] = $data;
+        $this->data[] = $data;
     }
 
     public function getData()

src/ScayTrase/SmsDeliveryBundle/DependencyInjection/Compiler/DataCollectorCompilerPass.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: batanov.pavel
+ * Date: 21.07.2015
+ * Time: 16:30
+ */
+
+namespace ScayTrase\SmsDeliveryBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class DataCollectorCompilerPass implements CompilerPassInterface
+{
+
+
+    /**
+     * You can modify the container here before it is dumped to PHP code.
+     *
+     * @param ContainerBuilder $container
+     *
+     * @api
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if ($container->hasDefinition('profiler') && $container->hasDefinition('data_collector.sms_delivery.data_collector')) {
+            $container
+                ->getDefinition('sms_delivery.sender')
+                ->addArgument(
+                    $container->getDefinition('data_collector.sms_delivery.data_collector')
+                );
+        }
+    }
+}

src/ScayTrase/SmsDeliveryBundle/DependencyInjection/Compiler/TransportCompilerPass.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: batanov.pavel
+ * Date: 21.07.2015
+ * Time: 16:26
+ */
+
+namespace ScayTrase\SmsDeliveryBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class TransportCompilerPass implements CompilerPassInterface
+{
+
+    /**
+     * You can modify the container here before it is dumped to PHP code.
+     *
+     * @param ContainerBuilder $container
+     *
+     * @api
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $container->getDefinition('sms_delivery.sender')->replaceArgument(
+            0,
+            $container->getDefinition($container->getParameter('sms_delivery.transport'))
+        );
+    }
+}

src/ScayTrase/SmsDeliveryBundle/DependencyInjection/SMSDeliveryExtension.php

@@ -19,19 +19,14 @@ class SmsDeliveryExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader->load('services.yml');
+
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
         foreach ($config as $key => $value) {
             $container->setParameter('sms_delivery.' . $key, $value);
         }
-
-        $container->getDefinition('sms_delivery.sender')->replaceArgument(
-            0,
-            $container->getParameter('sms_delivery.transport')
-        );
-
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-        $loader->load('services.yml');
     }
 }

src/ScayTrase/SmsDeliveryBundle/Resources/config/services.yml

@@ -1,14 +1,19 @@
 parameters:
     sms_delivery.transport: @sms_delivery.dummy_sender
+    sms_delivery.disable_delivery: false
+    sms_delivery.delivery_recipient: null
 
 services:
     sms_delivery.dummy_sender:
         class: ScayTrase\SmsDeliveryBundle\Transport\DummyTransport
         arguments: [@service_container]
 
     sms_delivery.sender:
-        class: %sms_delivery.class%
-        arguments: [@service_container]
+        class: ScayTrase\SmsDeliveryBundle\Service\MessageDeliveryService
+        arguments:
+        - %sms_delivery.transport%
+        - %sms_delivery.disable_delivery%
+        - %sms_delivery.delivery_recipient%
 
     data_collector.sms_delivery.data_collector:
         class: ScayTrase\SmsDeliveryBundle\DataCollector\MessageDeliveryDataCollector

src/ScayTrase/SmsDeliveryBundle/SMSDeliveryBundle.php

@@ -2,9 +2,29 @@
 
 namespace ScayTrase\SMSDeliveryBundle;
 
+use ScayTrase\SmsDeliveryBundle\DependencyInjection\Compiler\DataCollectorCompilerPass;
+use ScayTrase\SmsDeliveryBundle\DependencyInjection\Compiler\TransportCompilerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class SmsDeliveryBundle extends Bundle
 {
+    /**
+     * Builds the bundle.
+     *
+     * It is only ever called once when the cache is empty.
+     *
+     * This method can be overridden to register compilation passes,
+     * other extensions, ...
+     *
+     * @param ContainerBuilder $container A ContainerBuilder instance
+     */
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+        $container->addCompilerPass(new TransportCompilerPass());
+        $container->addCompilerPass(new DataCollectorCompilerPass());
+    }
+
 }
 

src/ScayTrase/SmsDeliveryBundle/Service/MessageDeliveryService.php

@@ -8,7 +8,6 @@
 
 namespace ScayTrase\SmsDeliveryBundle\Service;
 
-
 use ScayTrase\SmsDeliveryBundle\DataCollector\MessageDeliveryDataCollector;
 use ScayTrase\SmsDeliveryBundle\Exception\DeliveryFailedException;
 use ScayTrase\SmsDeliveryBundle\Transport\TransportInterface;
@@ -18,7 +17,7 @@
  * @package ScayTrase\Utils\SMSDeliveryBundle\Service
  * Basic sender service class. Implement sendMessage() method with actual 3rd-party SMS sending API interaction.
  */
-abstract class MessageDeliveryService
+class MessageDeliveryService
 {
     /** @var  TransportInterface */
     protected $transport;
@@ -32,12 +31,12 @@ abstract class MessageDeliveryService
     /**
      * @param TransportInterface $transport
      * @param bool $deliveryDisabled
-     * @param null $recipientOverride
+     * @param null|string $recipientOverride
      * @param MessageDeliveryDataCollector $collector
      */
     public function __construct(
         TransportInterface $transport,
-        $deliveryDisabled = true,
+        $deliveryDisabled = false,
         $recipientOverride = null,
         MessageDeliveryDataCollector $collector = null
     ) {
@@ -62,6 +61,7 @@ public function send(ShortMessageInterface $message)
                     'reason' => 'sms_delivery.disable_delivery is true',
                 ));
             }
+
             return true;
         }