Merge 60afd81 into 930400f

Author: ozayr-zaviar

src/Optimizely/OptimizelyConfig/OptimizelyFeature.php

@@ -99,11 +99,14 @@ public function getDeliveryRules()
     }
 
     /**
+     * @deprecated. Use 'experimentRules' and 'deliveryRules' instead.
+     *
      * @return array Map of Experiment Keys to OptimizelyExperiments.
      */
     public function getExperimentsMap()
     {
-        # This experimentsMap is deprecated. Use experimentRules and deliveryRules instead.
+        trigger_error('Method ' . __METHOD__ . ' is deprecated. Use experimentRules and deliveryRules instead.', E_USER_WARNING);
+
         return $this->experimentsMap;
     }
 

tests/OptimizelyConfigTests/OptimizelyEntitiesTest.php

@@ -96,7 +96,8 @@ public function testOptimizelyFeatureEntity()
 
         $this->assertEquals("id", $optFeature->getId());
         $this->assertEquals("key", $optFeature->getKey());
-        $this->assertEquals(["a" => "apple"], $optFeature->getExperimentsMap());
+        # Suppressing warning in getExperimentMap to pass testcase
+        $this->assertEquals(["a" => "apple"], @$optFeature->getExperimentsMap());
         $this->assertEquals(["o" => "orange"], $optFeature->getVariablesMap());
         $this->assertEquals([], $optFeature->getExperimentRules());
         $this->assertEquals([], $optFeature->getDeliveryRules());
@@ -115,6 +116,26 @@ public function testOptimizelyFeatureEntity()
         $this->assertEquals($expectedJson, json_encode($optFeature));
     }
 
+    /**
+    * @expectedException PHPUnit_Framework_Error
+    */
+    public function testOptimizelyFeatureGetExperimentsMapEmitsWarning()
+    {
+        $optFeature = new OptimizelyFeature(
+            "id",
+            "key",
+            ["a" => "apple"],
+            ["o" => "orange"],
+            [],
+            []
+        );
+
+        $this->assertEquals("id", $optFeature->getId());
+        $this->assertEquals("key", $optFeature->getKey());
+
+        $this->assertEquals(["a" => "apple"], $optFeature->getExperimentsMap());
+    }
+
     public function testOptimizelyVariableEntity()
     {
         $optVariable = new OptimizelyVariable(