.gitignore

@@ -1,3 +1,5 @@
 /vendor/
+/Tests/app/cache/
 /composer.lock
 /node_modules
+/Tests/app/cache/

.travis.yml

@@ -1,15 +1,26 @@
-sudo: false
+sudo: true
 language: php
 php:
-  - 5.5
-  - 5.6
   - 7.0
+  - 7.1
   - hhvm
+env:
+  global:
+    - JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"
+    - ES_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.1.2.zip"
 matrix:
   allow_failures:
     - php: hhvm
-services:
-  - elasticsearch
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer
+install:
+  # Container based PHP image ues PHP 5.6.5, once it will be upgraded sudo will be not necessary
+  - sudo apt-get install -y oracle-java8-set-default
+  - curl -L -o elasticsearch.zip $ES_URL
+  - unzip elasticsearch.zip
+  - ./elasticsearch-*/bin/elasticsearch -d
 before_script:
   - if [[ $TRAVIS_PHP_VERSION != "7.0" ]] && [[ $TRAVIS_PHP_VERSION != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi
   - composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH

CHANGELOG.md

@@ -0,0 +1,13 @@
+# CHANGELOG
+
+## v2.0.0 (2017-03-22)
+- Added Experiments functionality.
+- Added cache clear command.
+- Fixed event naming.
+
+### Breaking changes
+- Drop PHP 5.5 support. Now only PHP >=5.6 are supported.
+- Drop Elasticsearch 2.x support. Now only ES >=5.0 are supported.
+
+## v1.0.0 (2016-10-04)   
+- First stable release

Command/CacheClearCommand.php

@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\SettingsBundle\Command;
+
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+class CacheClearCommand extends ContainerAwareCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        parent::configure();
+
+        $this
+            ->setName('ongr:settings:cache:clear')
+            ->setDescription('Clears a selected setting from cache.')
+            ->addArgument(
+                'setting_name',
+                InputArgument::REQUIRED,
+                'Setting name to remove from cache'
+            );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $io = new SymfonyStyle($input, $output);
+
+        if (!$this->getContainer()->has('ong_settings.cache_provider')) {
+            throw new \RuntimeException('`ong_settings.cache_provider` service not available');
+        }
+
+        $cache = $this->getContainer()->get('ong_settings.cache_provider');
+        $setting = $input->getArgument('setting_name');
+
+        if (!$cache->contains($setting)) {
+            $io->note(sprintf('Cache does not contain a setting named `%s`', $setting));
+            return;
+        }
+
+        $cache->delete($setting);
+
+        $io->success(sprintf('`%s` has been successfully cleared from cache', $setting));
+    }
+}

Controller/ExperimentsController.php

@@ -0,0 +1,152 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\SettingsBundle\Controller;
+
+use DeviceDetector\Parser\Device\DeviceParserAbstract;
+use DeviceDetector\Parser\OperatingSystem;
+use ONGR\SettingsBundle\Document\Setting;
+use ONGR\SettingsBundle\Service\SettingsManager;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Class SettingsListController. Is used for managing settings in General env.
+ */
+class ExperimentsController extends Controller
+{
+    public function listAction(Request $request)
+    {
+        return $this->render('ONGRSettingsBundle:Experiments:list.html.twig');
+    }
+
+    /**
+     * Returns a json list of experiments
+     *
+     * @return JsonResponse
+     */
+    public function getFullExperimentsAction()
+    {
+        $experimentsArray = [];
+        /** @var SettingsManager $manager */
+        $manager = $this->get('ongr_settings.settings_manager');
+        $experiments = $manager->getAllExperiments();
+        $activeExperiments = $manager->getActiveExperiments();
+
+        /** @var Setting $experiment */
+        foreach ($experiments as $experiment) {
+            $experiment = $experiment->getSerializableData();
+            $experiment['active'] = in_array($experiment['name'], $activeExperiments);
+            $experimentsArray[] = $experiment;
+        }
+
+        return new JsonResponse(
+            ['count' => count($experiments), 'documents' => $experimentsArray]
+        );
+    }
+
+    /**
+     * Returns a json list of targets for experiment
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function getTargetsAction(Request $request)
+    {
+        $targets = [
+            'Devices' => [
+                'types' => DeviceParserAbstract::getAvailableDeviceTypeNames(),
+                'brands' => DeviceParserAbstract::$deviceBrands,
+            ],
+            'Clients' => [
+                'types' => [
+                    'Browser',
+                    'FeedReader',
+                    'Library',
+                    'MediaPlayer',
+                    'MobileApp',
+                    'PIM',
+                ],
+                'clients' => [],
+            ],
+            'OS' => [
+                'types' => OperatingSystem::getAvailableOperatingSystems(),
+            ]
+        ];
+
+        if (!empty($select = json_decode($request->get('selected'), true)) && isset($select['Clients']['types'])) {
+            $targets['Clients']['clients'] = $this->getClientsByTypes($select['Clients']['types']);
+        }
+
+        return new JsonResponse($targets);
+    }
+
+    /**
+     * Returns a json list of targets for experiment
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function getClientsByTypesAction(Request $request)
+    {
+        $types = $request->get('types');
+
+        if (!$types) {
+            return new JsonResponse();
+        }
+
+        $clients = $this->getClientsByTypes($types);
+
+        return new JsonResponse($clients);
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function toggleAction(Request $request)
+    {
+        $name = $request->get('name');
+        try {
+            $this->get('ongr_settings.settings_manager')->toggleExperiment($name);
+        } catch (\Exception $e) {
+            return new JsonResponse(['error' => true]);
+        }
+
+        return new JsonResponse(['error' => false]);
+    }
+
+    /**
+     * @param array $types
+     * @return array
+     */
+    private function getClientsByTypes(array $types)
+    {
+        $clients = [];
+
+        try {
+            foreach ($types as $type) {
+                $clients = array_merge(
+                    ("\\DeviceDetector\\Parser\\Client\\$type")::getAvailableClients(),
+                    $clients
+                );
+            }
+        } catch (\Exception $e) {
+            return [];
+        }
+
+        return $clients;
+    }
+}

Controller/ProfilesController.php

@@ -13,7 +13,7 @@
 
 use ONGR\ElasticsearchBundle\Result\DocumentIterator;
 use ONGR\ElasticsearchBundle\Service\Repository;
-use ONGR\ElasticsearchDSL\Aggregation\TermsAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation;
 use ONGR\ElasticsearchBundle\Result\Aggregation\AggregationValue;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -50,7 +50,7 @@ public function getAllProfilesAction()
         $search->addAggregation(new TermsAggregation('profiles', 'profile'));
 
         /** @var DocumentIterator $result */
-        $result = $repo->execute($search);
+        $result = $repo->findDocuments($search);
 
         /** @var AggregationValue $agg */
         foreach ($result->getAggregation('profiles') as $agg) {

Controller/SettingsController.php

@@ -110,6 +110,10 @@ public function submitAction(Request $request)
             $manager = $this->get('ongr_settings.settings_manager');
             $data = $request->get('setting');
 
+            if (!empty($data['value']) && !is_string($data['value'])) {
+                $data['value'] = json_encode($data['value']);
+            }
+
             if ($request->get('force')) {
                 $name = $request->get('name');
                 $manager->update($name, $data);

DependencyInjection/Compiler/SettingsManagerPass.php

@@ -11,6 +11,7 @@
 
 namespace ONGR\SettingsBundle\DependencyInjection\Compiler;
 
+use ONGR\FilterManagerBundle\DependencyInjection\ONGRFilterManagerExtension;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -26,23 +27,31 @@ public function process(ContainerBuilder $container)
         $repo = $container->getParameter('ongr_settings.repo');
         $filterManager = new Definition('ONGR\FilterManagerBundle\Search\FilterManager', [
             new Reference('ongr_settings.filter_container'),
-            new Reference($repo)
+            new Reference($repo),
+            new Reference('event_dispatcher')
         ]);
 
-        $container->setDefinition('ongr_filter_manager.settings', $filterManager);
+        $container->setDefinition(ONGRFilterManagerExtension::getFilterManagerId('settings'), $filterManager);
 
         $settingsManager = new Definition('ONGR\SettingsBundle\Service\SettingsManager', [
             new Reference($repo),
             new Reference('event_dispatcher')
         ]);
 
         $settingsManager->addMethodCall('setActiveProfilesSettingName', ['%ongr_settings.active_profiles%']);
+        $settingsManager->addMethodCall('setActiveExperimentsSettingName', ['%ongr_settings.active_experiments%']);
         $settingsManager->addMethodCall(
             'setActiveProfilesCookie',
             [
                 new Reference('ongr_settings.cookie.active_profiles')
             ]
         );
+        $settingsManager->addMethodCall(
+            'setActiveExperimentProfilesCookie',
+            [
+                new Reference('ongr_settings.cookie.active_experiments')
+            ]
+        );
         $settingsManager->addMethodCall('setCache', [new Reference('ong_settings.cache_provider')]);
 
         $container->setDefinition('ongr_settings.settings_manager', $settingsManager);