From 362f455d033d3c569967d415e7dfd8446febeb7b Mon Sep 17 00:00:00 2001
From: Hafiq <hafiqiqmal93@gmail.com>
Date: Wed, 2 Oct 2019 16:29:49 +0800
Subject: [PATCH 1/2] restructure code

---
 .idea/MalaysiaHoliday.iml         |   4 +-
 .idea/workspace.xml               | 453 ++++--------------------------
 README.md                         | 107 ++++---
 composer.json                     |   2 +-
 composer.lock                     | 297 ++++++++++++--------
 example/index.php                 |   4 +-
 src/Holiday.php                   | 271 ++++++++++--------
 src/exception/RegionException.php |  12 +
 tests/HolidayTest.php             |  32 ++-
 9 files changed, 495 insertions(+), 687 deletions(-)
 create mode 100644 src/exception/RegionException.php

diff --git a/.idea/MalaysiaHoliday.iml b/.idea/MalaysiaHoliday.iml
index 81080d8..abacd4b 100644
--- a/.idea/MalaysiaHoliday.iml
+++ b/.idea/MalaysiaHoliday.iml
@@ -9,7 +9,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/promises" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/psr7" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/nesbot/carbon" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-common" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-docblock" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/type-resolver" />
@@ -22,6 +21,7 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit-mock-objects" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-message" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/ralouphie/getallheaders" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
@@ -33,12 +33,10 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/resource-operations" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/browser-kit" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/contracts" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/css-selector" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/dom-crawler" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/yaml" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/vlucas/phpdotenv" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6838bad..eb1737c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="2cb85e8e-22d7-404a-a917-ddf85cce18f7" name="Default" comment="" />
+    <list default="true" id="2cb85e8e-22d7-404a-a917-ddf85cce18f7" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/src/exception/RegionException.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/MalaysiaHoliday.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/MalaysiaHoliday.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/example/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Holiday.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Holiday.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/HolidayTest.php" beforeDir="false" afterPath="$PROJECT_DIR$/tests/HolidayTest.php" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -10,58 +20,9 @@
   </component>
   <component name="ComposerSettings" doNotAsk="true">
     <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
-    <executablePath>composer</executablePath>
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="-476275074">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="2" />
-          <entry key="project.open.time.3" value="1" />
-          <entry key="project.open.time.6" value="1" />
-          <entry key="project.open.time.8" value="1" />
-          <entry key="project.opened" value="3" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="json" value="4" />
-          <entry key="md" value="32" />
-          <entry key="php" value="957" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JSON" value="4" />
-          <entry key="Markdown" value="32" />
-          <entry key="PHP" value="1148" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.php.composer.actions">
-        <counts>
-          <entry key="updateAll_from_ComposerEditorNotificationPanel" value="1" />
-          <entry key="validate_from_ComposerEditorNotificationPanel.ExtraActions" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.php.composer.command.options">
-        <counts>
-          <entry key="validate_with_--ansi_--no-check-publish_--no-interaction_--verbose_--with-dependencies.default" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="json" value="1" />
-          <entry key="php" value="3" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="JSON" value="1" />
-          <entry key="PHP" value="4" />
-          <entry key="composer.json" value="1" />
-        </counts>
-      </usages-collector>
-    </session>
+    <execution>
+      <executable path="composer" />
+    </execution>
   </component>
   <component name="FileColors">
     <fileColor scope="Non-Project Files (Material Default)" color="2E3C43" />
@@ -70,122 +31,9 @@
     <fileColor scope="Non-Project Files (Material Palenight)" color="2f2e43" />
     <fileColor scope="Non-Project Files (Material Oceanic)" color="2E3C43" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Holiday.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
-              <caret line="172" column="36" selection-start-line="172" selection-start-column="36" selection-end-line="172" selection-end-column="36" />
-              <folding>
-                <element signature="e#45#63#0#PHP" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/composer.json">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="260">
-              <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tests/HolidayTest.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="23" selection-start-line="23" selection-end-line="23" />
-              <folding>
-                <element signature="e#75#106#0#PHP" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="483">
-                <caret line="72" column="17" selection-start-line="72" selection-start-column="17" selection-end-line="72" selection-end-column="17" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/phpunit.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="280">
-              <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/index.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="260">
-              <caret line="17" column="41" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>json_encode($this-&gt;result, JSON_PRETTY_PRINT);</find>
-      <find>json_encode($this-&gt;result, JSON_PRETTY_PRINT</find>
-      <find>header('Content-Type: application/json');</find>
-      <find>json_encode($this-&gt;result);</find>
-      <find>$this-&gt;result;</find>
-      <find>(object) $this-&gt;result;</find>
-      <find>(object)</find>
-    </findStrings>
-    <replaceStrings>
-      <replace>$this-&gt;result</replace>
-      <replace>$this-&gt;result;</replace>
-      <replace>array_map(__FUNCTION__, $this-&gt;result);</replace>
-      <replace>$this-response($this-&gt;result);</replace>
-      <replace>$this-&gt;getResult();</replace>
-    </replaceStrings>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/phpunit.xml" />
-        <option value="$PROJECT_DIR$/.travis.yml" />
-        <option value="$PROJECT_DIR$/composer.json" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/example/index.php" />
-        <option value="$PROJECT_DIR$/tests/HolidayTest.php" />
-        <option value="$PROJECT_DIR$/src/Holiday.php" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
   <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 7.1">
     <include_path>
       <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
@@ -225,16 +73,10 @@
       <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
       <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/contracts" />
-      <path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
+      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
     </include_path>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
-    <option name="width" value="1680" />
-    <option name="height" value="1027" />
-  </component>
+  <component name="ProjectId" id="1RdFxj8dzRrzRTjhzCbMdsT6pM9" />
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
       <profile-state>
@@ -254,44 +96,11 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="MalaysiaHoliday" type="b2602c69:ProjectViewProjectNode" />
-              <item name="MalaysiaHoliday" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="MalaysiaHoliday" type="b2602c69:ProjectViewProjectNode" />
-              <item name="MalaysiaHoliday" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="MalaysiaHoliday" type="b2602c69:ProjectViewProjectNode" />
-              <item name="MalaysiaHoliday" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="MalaysiaHoliday" type="b2602c69:ProjectViewProjectNode" />
-              <item name="MalaysiaHoliday" type="462c0819:PsiDirectoryNode" />
-              <item name="tests" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="ignore_missing_gitignore" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="php.override.implement.member.chooser.php.doc" value="NONE" />
     <property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" />
   </component>
   <component name="RecentsManager">
@@ -314,11 +123,35 @@
       </list>
     </option>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="PHPUnit.RequestTest.testErrorMessage">
+    <configuration name="RequestTest.testErrorMessage" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner class="Tests\RequestTest" file="$PROJECT_DIR$/tests/HolidayTest.php" method="testErrorMessage" scope="Method" />
+      <method v="2" />
+    </configuration>
+    <configuration name="RequestTest.testGetAllRegionHoliday" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner class="Tests\RequestTest" file="$PROJECT_DIR$/tests/HolidayTest.php" method="testGetAllRegionHoliday" scope="Method" />
+      <method v="2" />
+    </configuration>
+    <configuration name="RequestTest.testGetMultipleRegionsHoliday" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner class="Tests\RequestTest" file="$PROJECT_DIR$/tests/HolidayTest.php" method="testGetMultipleRegionsHoliday" scope="Method" />
+      <method v="2" />
+    </configuration>
+    <configuration name="RequestTest.testGetSpecificRegionHoliday" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner class="Tests\RequestTest" file="$PROJECT_DIR$/tests/HolidayTest.php" method="testGetSpecificRegionHoliday" scope="Method" />
+      <method v="2" />
+    </configuration>
     <configuration name="Unnamed" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
       <TestRunner configuration_file="$PROJECT_DIR$/phpunit.xml" directory="$PROJECT_DIR$/tests" use_alternative_configuration_file="true" />
       <method v="2" />
     </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="PHPUnit.RequestTest.testErrorMessage" />
+        <item itemvalue="PHPUnit.RequestTest.testGetMultipleRegionsHoliday" />
+        <item itemvalue="PHPUnit.RequestTest.testGetSpecificRegionHoliday" />
+        <item itemvalue="PHPUnit.RequestTest.testGetAllRegionHoliday" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SvnConfiguration">
     <configuration />
@@ -335,202 +168,24 @@
       <workItem from="1511084986160" duration="2112000" />
       <workItem from="1534526676960" duration="2348000" />
       <workItem from="1534561519168" duration="2990000" />
-      <workItem from="1556597746342" duration="1438000" />
+      <workItem from="1556597746342" duration="3258000" />
+      <workItem from="1569989319794" duration="11719000" />
     </task>
     <servers />
   </component>
-  <component name="TestHistory">
-    <history-entry file="Unnamed - 2018.08.18 at 01h 41m 51s.xml">
-      <configuration name="Unnamed" configurationId="PHPUnitRunConfigurationType" />
-    </history-entry>
-    <history-entry file="Unnamed - 2018.08.18 at 02h 00m 05s.xml">
-      <configuration name="Unnamed" configurationId="PHPUnitRunConfigurationType" />
-    </history-entry>
-    <history-entry file="Unnamed - 2018.08.18 at 11h 19m 55s.xml">
-      <configuration name="Unnamed" configurationId="PHPUnitRunConfigurationType" />
-    </history-entry>
-    <history-entry file="Unnamed - 2018.08.18 at 23h 12m 58s.xml">
-      <configuration name="Unnamed" configurationId="PHPUnitRunConfigurationType" />
-    </history-entry>
-    <history-entry file="Unnamed - 2018.08.18 at 23h 13m 05s.xml">
-      <configuration name="Unnamed" configurationId="PHPUnitRunConfigurationType" />
-    </history-entry>
-    <history-entry file="Unnamed - 2018.08.18 at 23h 13m 33s.xml">
-      <configuration name="Unnamed" configurationId="PHPUnitRunConfigurationType" />
-    </history-entry>
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="14632000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1680" height="1027" extended-state="6" />
-    <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26434678" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32883817" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Version Control" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.4993895" visible="true" weight="0.32752994" />
-      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50061053" side_tool="true" weight="0.32752994" />
-      <window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
-      <window_info anchor="right" id="Nativescript Palette" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-    </layout>
-    <layout-to-restore>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26129428" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32883817" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Version Control" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="8" weight="0.32780084" />
-      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.3297062" />
-      <window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-    </layout-to-restore>
-  </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/vendor/guzzlehttp/guzzle/src/Client.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="45" column="48" selection-start-line="45" selection-start-column="48" selection-end-line="45" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_1.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="53">
-          <caret line="203" column="29" selection-start-line="203" selection-start-column="29" selection-end-line="203" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/composer/autoload_classmap.php">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/fabpot/goutte/Goutte/Client.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="29" column="6" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mit.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="80">
-            <caret line="4" selection-start-line="4" selection-end-line="4" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/coverage.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="20">
-          <caret line="1" column="4" selection-start-line="1" selection-start-column="4" selection-end-line="1" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/json/json.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="88" column="9" selection-start-line="88" selection-start-column="9" selection-end-line="88" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/HolidayTest.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="23" selection-start-line="23" selection-end-line="23" />
-          <folding>
-            <element signature="e#75#106#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/phpunit.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="17" column="41" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="483">
-            <caret line="72" column="17" selection-start-line="72" selection-start-column="17" selection-end-line="72" selection-end-column="17" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/date/date.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="956" column="9" selection-start-line="956" selection-start-column="9" selection-end-line="956" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Holiday.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="172" column="36" selection-start-line="172" selection-start-column="36" selection-end-line="172" selection-end-column="36" />
-          <folding>
-            <element signature="e#45#63#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/composer.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/README.md b/README.md
index f2c98af..fee43dd 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,8 @@ Holidays in specific years
 
 ```php
 $holiday = new Holiday;
-$holiday->getAllRegionHoliday("2017")->get();
+$holiday->getAllRegionHoliday(2017)->get();
+$holiday->getAllRegionHoliday([2017, 2019])->get();
 ```
 
 Holidays by regional
@@ -36,6 +37,8 @@ Holidays by regional in 2017
 ```php
 $holiday = new Holiday;
 $holiday->getRegionHoliday("Selangor","2017")->get();
+$holiday->getRegionHoliday("Selangor", [2017, 2019])->get();
+$holiday->getRegionHoliday(["Selangor","Malacca"], [2017, 2019])->get();
 ```
 
 
@@ -48,57 +51,77 @@ $holiday->getAllRegionHoliday()->filterByMonth("January")->get();  //date('F')
 ```
 
 ### Requirement
-- PHP 5.6+
-- Tested in 5.6, 7.0, 7.1
+- PHP 7.0+ (because 5.6 too old 😝)
 
 ### install
 
 `composer require afiqiqmal/malaysiaholiday`
 
-or 
-
-```
-require{
-	"afiqiqmal/malaysiaholiday": "^1.1.0"
-}
-```
-
-
 ### Sample
 <pre>
-    {
-        "status": true,
-        "regional": "Selangor",
-        "year": "2018",
-        "data": [
+{
+   "status":true,
+   "data":[
+      {
+         "regional":"Selangor",
+         "collection":[
             {
-                "day": "Monday",
-                "date": "2018-01-01",
-                "date_formatted": "01 January 2018",
-                "month": "January",
-                "name": "New Year's Day",
-                "description": "All regions except Johor, Kedah, Kelantan, Perlis, Terengganu",
-                "is_holiday": true,
-                "type": "Regional Holiday"
-            },
+               "year":2019,
+               "data":[
+                  {
+                     "day":"Tuesday",
+                     "date":"2019-01-01",
+                     "date_formatted":"01 January 2019",
+                     "month":"January",
+                     "name":"New Year's Day",
+                     "description":"Regional Holiday",
+                     "is_holiday":true,
+                     "type":"Regional Holiday",
+                     "type_id":4
+                  },
+                  {
+                     "day":"Monday",
+                     "date":"2019-01-21",
+                     "date_formatted":"21 January 2019",
+                     "month":"January",
+                     "name":"Thaipusam",
+                     "description":"Regional Holiday",
+                     "is_holiday":true,
+                     "type":"Regional Holiday",
+                     "type_id":4
+                  }
+               ]
+            }
+         ]
+      },
+      {
+         "regional":"Johor",
+         "collection":[
             {
-                "day": "Wednesday",
-                "date": "2018-01-31",
-                "date_formatted": "31 January 2018",
-                "month": "January",
-                "name": "Thaipusam",
-                "description": "Hindu festival",
-                "is_holiday": true,
-                "type": "Regional Holiday"
+               "year":2019,
+               "data":[
+                  {
+                     "day":"Monday",
+                     "date":"2019-01-21",
+                     "date_formatted":"21 January 2019",
+                     "month":"January",
+                     "name":"Thaipusam",
+                     "description":"Regional Holiday",
+                     "is_holiday":true,
+                     "type":"Regional Holiday",
+                     "type_id":4
+                  }
+               ]
             }
-        ],
-            "sources": null,
-            "developer": {
-            "name": "Hafiq",
-            "email": "hafiqiqmal93@gmail.com",
-            "github": "https://github.com/afiqiqmal"
-        }
-    }
+         ]
+      }
+   ],
+   "developer":{
+      "name":"Hafiq",
+      "email":"hafiqiqmal93@gmail.com",
+      "github":"https://github.com/afiqiqmal"
+   }
+}
 </pre>
 
 ### Source
diff --git a/composer.json b/composer.json
index ed0f62b..b6ae801 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.0",
         "fabpot/goutte": "^3.2"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index f1f474c..fcda838 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "098ce911470990d96174d9b171323955",
+    "content-hash": "71fe02fd36135937be768c35d4a152ca",
     "packages": [
         {
             "name": "fabpot/goutte",
@@ -179,32 +179,37 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.4.2",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
             },
             "provide": {
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "ext-zlib": "*",
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+            },
+            "suggest": {
+                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.6-dev"
                 }
             },
             "autoload": {
@@ -234,13 +239,14 @@
             "keywords": [
                 "http",
                 "message",
+                "psr-7",
                 "request",
                 "response",
                 "stream",
                 "uri",
                 "url"
             ],
-            "time": "2017-03-20T17:10:46+00:00"
+            "time": "2019-07-01T23:21:34+00:00"
         },
         {
             "name": "psr/http-message",
@@ -292,18 +298,58 @@
             ],
             "time": "2016-08-06T14:39:51+00:00"
         },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "time": "2019-03-08T08:55:37+00:00"
+        },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.1.3",
+            "version": "v4.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd"
+                "reference": "9e5dddb637b13db82e35695a8603fe6e118cc119"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c55fe9257003b2d95c0211b3f6941e8dfd26dffd",
-                "reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9e5dddb637b13db82e35695a8603fe6e118cc119",
+                "reference": "9e5dddb637b13db82e35695a8603fe6e118cc119",
                 "shasum": ""
             },
             "require": {
@@ -312,6 +358,8 @@
             },
             "require-dev": {
                 "symfony/css-selector": "~3.4|~4.0",
+                "symfony/http-client": "^4.3",
+                "symfony/mime": "^4.3",
                 "symfony/process": "~3.4|~4.0"
             },
             "suggest": {
@@ -320,7 +368,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -347,20 +395,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:10:45+00:00"
+            "time": "2019-08-26T08:26:39+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.1.3",
+            "version": "v4.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "2a4df7618f869b456f9096781e78c57b509d76c7"
+                "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/2a4df7618f869b456f9096781e78c57b509d76c7",
-                "reference": "2a4df7618f869b456f9096781e78c57b509d76c7",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/c6e5e2a00db768c92c3ae131532af4e1acc7bd03",
+                "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03",
                 "shasum": ""
             },
             "require": {
@@ -369,7 +417,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -385,14 +433,14 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
                 },
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
@@ -400,20 +448,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:10:45+00:00"
+            "time": "2019-08-20T14:07:54+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.1.3",
+            "version": "v4.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e"
+                "reference": "cc686552948d627528c0e2e759186dff67c2610e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1c4519d257e652404c3aa550207ccd8ada66b38e",
-                "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/cc686552948d627528c0e2e759186dff67c2610e",
+                "reference": "cc686552948d627528c0e2e759186dff67c2610e",
                 "shasum": ""
             },
             "require": {
@@ -421,7 +469,11 @@
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
+            "conflict": {
+                "masterminds/html5": "<2.6"
+            },
             "require-dev": {
+                "masterminds/html5": "^2.6",
                 "symfony/css-selector": "~3.4|~4.0"
             },
             "suggest": {
@@ -430,7 +482,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -457,20 +509,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:00:49+00:00"
+            "time": "2019-08-26T08:26:39+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.9.0",
+            "version": "v1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+                "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
+                "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
                 "shasum": ""
             },
             "require": {
@@ -482,7 +534,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.12-dev"
                 }
             },
             "autoload": {
@@ -498,13 +550,13 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
                 {
                     "name": "Gert de Pagter",
                     "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -515,20 +567,20 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-08-06T08:03:45+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
+                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
-                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
                 "shasum": ""
             },
             "require": {
@@ -540,7 +592,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                 }
             },
             "autoload": {
@@ -574,33 +626,35 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-02-06T07:57:58+00:00"
+            "time": "2019-08-06T08:03:45+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
+                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
+                "doctrine/coding-standard": "^6.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
-                "squizlabs/php_codesniffer": "^3.0.2"
+                "phpbench/phpbench": "^0.13",
+                "phpstan/phpstan-phpunit": "^0.11",
+                "phpstan/phpstan-shim": "^0.11",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
@@ -625,25 +679,25 @@
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
             "keywords": [
                 "constructor",
                 "instantiate"
             ],
-            "time": "2017-07-22T11:58:36+00:00"
+            "time": "2019-03-17T17:37:11+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.8.1",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
+                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea",
+                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea",
                 "shasum": ""
             },
             "require": {
@@ -678,39 +732,37 @@
                 "object",
                 "object graph"
             ],
-            "time": "2018-06-11T23:09:50+00:00"
+            "time": "2019-08-09T12:45:53+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "phpunit/phpunit": "~6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -732,30 +784,30 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2017-09-11T18:02:19+00:00"
+            "time": "2018-08-07T13:53:10+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.0",
+            "version": "4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
+                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
+                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
+                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
+                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
                 "webmozart/assert": "^1.0"
             },
             "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
+                "doctrine/instantiator": "^1.0.5",
                 "mockery/mockery": "^1.0",
                 "phpunit/phpunit": "^6.4"
             },
@@ -783,41 +835,40 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-30T07:14:17+00:00"
+            "time": "2019-09-12T14:27:41+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
+                "php": "^7.1",
+                "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
+                "ext-tokenizer": "^7.1",
+                "mockery/mockery": "~1",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -830,20 +881,21 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-07-14T14:27:02+00:00"
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "time": "2019-08-22T18:11:29+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.8.0",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+                "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
+                "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
                 "shasum": ""
             },
             "require": {
@@ -864,8 +916,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -893,7 +945,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2018-08-05T17:53:17+00:00"
+            "time": "2019-06-13T12:50:23+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1801,16 +1853,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.1.3",
+            "version": "v4.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "46bc69aa91fc4ab78a96ce67873a6b0c148fd48c"
+                "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/46bc69aa91fc4ab78a96ce67873a6b0c148fd48c",
-                "reference": "46bc69aa91fc4ab78a96ce67873a6b0c148fd48c",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686",
+                "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686",
                 "shasum": ""
             },
             "require": {
@@ -1829,7 +1881,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -1856,24 +1908,25 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:24:31+00:00"
+            "time": "2019-08-20T14:27:59+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.5.1",
+            "version": "v2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e"
+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
-                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.3.9",
+                "symfony/polyfill-ctype": "^1.9"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.35 || ^5.0"
@@ -1881,7 +1934,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -1906,28 +1959,28 @@
                 "env",
                 "environment"
             ],
-            "time": "2018-07-29T20:33:41+00:00"
+            "time": "2019-01-29T11:11:52+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.3.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
+                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^5.3.3 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
+                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
             },
             "type": "library",
             "extra": {
@@ -1956,7 +2009,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2018-01-29T19:49:41+00:00"
+            "time": "2019-08-24T08:43:50+00:00"
         }
     ],
     "aliases": [],
@@ -1965,7 +2018,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.6"
+        "php": ">=7.0"
     },
     "platform-dev": []
 }
diff --git a/example/index.php b/example/index.php
index d391425..9380b66 100644
--- a/example/index.php
+++ b/example/index.php
@@ -12,8 +12,8 @@
 
 $holiday = new Holiday;
 
-$result = $holiday->getRegionHoliday(['Selangor', 'Malacca'])->get();
+$result = $holiday->getRegionHoliday(['Selangor', 'Johore'])->filterByMonth(1)->get();
 
 //print_r($result);
 header('Content-Type: application/json');
-echo json_encode($result['data']['Selangor']);
+echo json_encode($result);
diff --git a/src/Holiday.php b/src/Holiday.php
index 4755448..974b3b4 100644
--- a/src/Holiday.php
+++ b/src/Holiday.php
@@ -2,26 +2,57 @@
 
 namespace afiqiqmal\MalaysiaHoliday;
 
-use Carbon\Carbon;
-use DateTime;
+use afiqiqmal\MalaysiaHoliday\exception\RegionException;
 use Goutte\Client;
 use GuzzleHttp\Client as GuzzleClient;
 
 class Holiday
 {
-    private $base_url;
-    private $regional_path;
+    private $months_array = [
+        1 => 'January',
+        2 => 'February',
+        3 => 'March',
+        4 => 'April',
+        5 => 'May',
+        6 => 'June',
+        7 => 'July',
+        8 => 'August',
+        9 => 'September',
+        10 => 'October',
+        11 => 'November',
+        12 => 'December'
+    ];
+
+    private $region_array = [
+        'Johor',
+        'Kedah',
+        'Kelantan',
+        'Kuala Lumpur',
+        'Labuan',
+        'Malacca',
+        'Negeri Sembilan',
+        'Pahang',
+        'Penang',
+        'Perak',
+        'Perlis',
+        'Putrajaya',
+        'Sarawak',
+        'Selangor',
+        'Terengganu'
+    ];
 
+    private $base_url;
     private $client;
-    private $result;
+
+    private $year;
+    private $region;
 
     private $month;
     private $groupByMonth = false;
 
     public function __construct()
     {
-        $this->base_url = "http://www.officeholidays.com/countries/malaysia";
-        $this->regional_path = "/regional.php";
+        $this->base_url = "https://www.officeholidays.com/countries/malaysia";
 
         $this->client = new Client();
         $guzzleClient = new GuzzleClient(
@@ -42,15 +73,15 @@ public static function init()
 
     public function getAllRegionHoliday($year = null)
     {
-        $year = $year ? $year : date('Y');
-        $this->result = $this->baseRequest(null, $year);
+        $this->region = null;
+        $this->year = $year;
         return $this;
     }
 
     public function getRegionHoliday($region, $year = null)
     {
-        $year = $year ? $year : date('Y');
-        $this->result = $this->baseRequest($region, $year);
+        $this->region = $region;
+        $this->year = $year;
         return $this;
     }
 
@@ -68,28 +99,49 @@ public function filterByMonth($month)
 
     public function get()
     {
-        if ($this->result['status']) {
-            $temp = [];
+        $result = $this->queryWeb($this->region, $this->year);
+
+        if ($result['status']) {
             if ($this->month != null && $this->checkMonth($this->month)) {
-                foreach ($this->result['data'] as $key => $holiday) {
-                    if (date('F', strtotime($holiday['date'])) == $this->month) {
-                        $temp[] = $holiday;
+                foreach ($result['data'] as $key => $data) { //regional
+                    foreach ($data['collection'] as $index => $collection) { //year
+                        $temp = [];
+                        foreach ($collection['data'] as $key2 => $holiday) { // holidays
+                            $month = date('F', strtotime($holiday['date']));
+                            if (strtolower($month) == $this->getMonth($this->month)) {
+                                $temp[] = $holiday;
+                            }
+                        }
+
+                        $result['data'][$key]['collection'][$index]['data'] = $temp;
                     }
                 }
 
-                $this->result['data'] = $temp;
-
-                return $this->result;
+                return $result;
             } elseif ($this->groupByMonth) {
-                foreach ($this->result['data'] as $key => $holiday) {
-                    $temp[date('F', strtotime($holiday['date']))][] = $holiday;
+                foreach ($result['data'] as $key => $data) { //regional
+                    foreach ($data['collection'] as $index => $collection) { //year
+                        $temp = [];
+                        foreach ($collection['data'] as $key2 => $holiday) { // holidays
+                            $month = date('F', strtotime($holiday['date']));
+                            $entry = array_search($month, array_column($temp, 'month'));
+                            if ($entry === false) {
+                                $temp[] = [
+                                    'month' => $month,
+                                    'data' => [$holiday],
+                                ];
+                            } else {
+                                $temp[$entry]['data'][] = $holiday;
+                            }
+                        }
+
+                        $result['data'][$key]['collection'][$index]['data'] = $temp;
+                    }
                 }
 
-                $this->result['data'] = $temp;
-
-                return $this->result;
+                return $result;
             } else {
-                return $this->result;
+                return $result;
             }
         } else {
             return [
@@ -99,62 +151,71 @@ public function get()
         }
     }
 
-    private function baseRequest($region, $year)
-    {
-        return $this->queryWeb($region, $year);
-    }
-
     private function queryWeb($regional, $year)
     {
-        try {
-            $arrays = [];
-            $request_url = null;
-            $currentYear = ($year==null) ? date('Y') : $year;
-            if ($regional == null) {
-                $request_url = $this->base_url."/".$year.".php";
-                $arrays = $this->trigger($regional, $currentYear);
-            } else {
-                if (is_array($regional)) {
-                    foreach ($regional as $region) {
-                        $arrays[$region] = $this->trigger($region, $currentYear);
-                    }
-                } else {
-                    $arrays = $this->trigger($regional, $currentYear);
-                }
-            }
+        $years = ($year == null) ? [date('Y')] : $year;
+        if (!is_array($years)) {
+            $years = [$year];
+        }
 
-            return [
-                'status' => true,
-                'regional' => ($regional == null) ? "all" : (is_array($regional) ? explode(",", $regional) : $regional),
-                'year'=> $currentYear,
-                'data' => $arrays,
-                'sources' => $request_url,
-                'developer' => [
-                    "name"=> "Hafiq",
-                    "email"=> "hafiqiqmal93@gmail.com",
-                    "github"=> "https://github.com/afiqiqmal"
-                ]
-            ];
+        if (!is_array($regional)) {
+            $regional = [$regional];
+        }
 
-        } catch (\Exception $e) {
-            return [
-                'status' => false,
-                'message' => "Something went wrong or not exist yet"
-            ];
+        $final = [];
+        $error_messages = [];
+        foreach ($regional as $region) {
+            $data = [];
+            try {
+                foreach ($years as $selectedYear) {
+                    $data[] = [
+                        'year' => (int)$selectedYear,
+                        'data' => $this->trigger($region, $selectedYear),
+                    ];
+                }
+
+                $final[] = [
+                    'regional' => $region ?? "Malaysia",
+                    'collection' => $data
+                ];
+            } catch (RegionException $regionException) {
+                $error_messages[] = $regionException->getMessage();
+                $final[] = [
+                    'regional' => $region ?? "Malaysia",
+                    'collection' => []
+                ];
+            }
         }
+
+        return [
+            'status' => true,
+            'data' => $final ?? [],
+            'error_messages' => $error_messages,
+            'developer' => [
+                "name" => "Hafiq",
+                "email" => "hafiqiqmal93@gmail.com",
+                "github" => "https://github.com/afiqiqmal"
+            ]
+        ];
     }
 
-    private function trigger($region, $currentYear) {
-        $request_url = $this->base_url;
+    /**
+     *
+     * @param $region
+     * @param $currentYear
+     * @return array
+     * @throws RegionException
+     */
+    private function trigger($region, $currentYear)
+    {
         if ($region) {
             if ($this->checkRegional($region)) {
-                $request_url = $request_url . $this->regional_path . "?list_year=$currentYear&list_region=$region";
+                $request_url = $this->base_url."/".$region."/".$currentYear;
             } else {
-                return [
-                    'status' => false,
-                    'message' => $region . " is not include in the regional state"
-                ];
+                throw new RegionException($region . " is not include in the regional state");
             }
+        } else {
+            $request_url = $this->base_url."/".$currentYear;
         }
 
         $arrays = array_values(array_filter($this->crawl($request_url, $currentYear)));
@@ -165,44 +226,53 @@ private function trigger($region, $currentYear) {
     private function crawl($request_url, $currentYear)
     {
         $crawler = $this->client->request('GET', $request_url);
-        $result = $crawler->filter('.list-table tr')->each(
+        $result = $crawler->filter('.country-table tr')->each(
             function ($node) use ($currentYear) {
                 if ($node->children()->nodeName() == 'td') {
                     $temp['day'] = trim($node->children()->eq(0)->text());
-                    $date_str = strtok(trim($node->children()->eq(1)->extract('_text', 'class')[0]), "\n")." ".$currentYear;
+                    $date_str = strtok(trim($node->children()
+                            ->eq(1)
+                            ->extract('_text', 'class')[0]), "\n")." ".$currentYear;
                     if ($date_str == null || empty($date_str)) {
                         return null;
                     }
 
-                    $date = date_create_from_format('F d Y', preg_replace("/[\n\r]/","", $date_str));
+                    $date = date_create_from_format('F d Y', preg_replace("/[\n\r]/", "", $date_str));
 
                     if (!$date) { //check another format
-                        $date = date_create_from_format('Y-m-d',  $node->children()->eq(1)->children()->text());
+                        $date = date_create_from_format('Y-m-d', $node->children()->eq(1)->children()->text());
                     }
 
-
                     $temp['date'] = date_format($date, 'Y-m-d');
                     $temp['date_formatted'] = date_format($date, 'd F Y');
                     $temp['month'] = date('F', strtotime($temp['date']));
                     $temp['name'] = trim($node->children()->eq(2)->text());
                     $temp['description'] = trim($node->children()->eq(3)->text());
                     $temp['is_holiday'] = true;
-                    switch ($node->extract('class')[0]) {
+                    switch (trim($node->extract('class')[0])) {
                         case 'govt_holiday':
                             $temp['type'] = "Government/Public Sector Holiday";
+                            $temp['type_id'] = 1;
                             break;
-                        case 'publicholiday':
+                        case 'nap-past':
+                        case 'nap':
                             $temp['type'] = "Not a Public Holiday";
                             $temp['is_holiday'] = false;
+                            $temp['type_id'] = 2;
                             break;
-                        case 'holiday':
+                        case 'country-past':
+                        case 'country':
                             $temp['type'] = "National Holiday";
+                            $temp['type_id'] = 3;
                             break;
-                        case 'regional':
+                        case 'region-past':
+                        case 'region':
                             $temp['type'] = "Regional Holiday";
+                            $temp['type_id'] = 4;
                             break;
                         default:
                             $temp['type'] = "Unknown";
+                            $temp['type_id'] = 5;
                             break;
                     }
 
@@ -216,24 +286,7 @@ function ($node) use ($currentYear) {
 
     private function checkRegional($regional)
     {
-        $arrays = array(
-            'Johor',
-            'Kedah',
-            'Kelantan',
-            'Kuala Lumpur',
-            'Labuan',
-            'Malacca',
-            'Negeri Sembilan',
-            'Pahang',
-            'Penang',
-            'Perak',
-            'Perlis',
-            'Putrajaya',
-            'Sarawak',
-            'Selangor',
-            'Terengganu'
-        );
-        if (in_array(strtolower($regional), array_map('strtolower', $arrays))) {
+        if (in_array(strtolower($regional), array_map('strtolower', $this->region_array))) {
             return true;
         }
         return false;
@@ -241,24 +294,16 @@ private function checkRegional($regional)
 
     private function checkMonth($month)
     {
-        $arrays = array(
-            'January',
-            'February',
-            'March',
-            'April',
-            'May',
-            'June',
-            'July',
-            'August',
-            'September',
-            'October',
-            'November',
-            'December'
-        );
-        if (in_array(strtolower($month), array_map('strtolower', $arrays))) {
+        if (in_array(strtolower($month), array_map('strtolower', array_values($this->months_array)))) {
             return true;
         }
-        return false;
+
+        return isset($this->months_array[$month]);
+    }
+
+    private function getMonth($month)
+    {
+        return strtolower($this->months_array[$month]) ?? strtolower($month);
     }
 }
 
diff --git a/src/exception/RegionException.php b/src/exception/RegionException.php
new file mode 100644
index 0000000..fca0876
--- /dev/null
+++ b/src/exception/RegionException.php
@@ -0,0 +1,12 @@
+<?php
+namespace afiqiqmal\MalaysiaHoliday\exception;
+
+use Throwable;
+
+class RegionException extends \Exception
+{
+    public function __construct($message = "", $code = 0, Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}
\ No newline at end of file
diff --git a/tests/HolidayTest.php b/tests/HolidayTest.php
index 5ddaf15..45ad51e 100644
--- a/tests/HolidayTest.php
+++ b/tests/HolidayTest.php
@@ -16,34 +16,56 @@ class RequestTest extends TestCase
     /**
      * To test getting all region holiday in Malaysia
      */
-    function testGetAllRegionHoliday()
+    public function testGetAllRegionHoliday()
     {
         $holiday = new Holiday;
         $response = $holiday->getAllRegionHoliday()->get();
 
         $this->assertTrue($response['status']);
+        $this->assertTrue($response['data'][0]['regional'] == 'Malaysia');
     }
 
     /**
      * To test getting specific region holiday
      */
-    function testGetSpecificRegionHoliday()
+    public function testGetSpecificRegionHoliday()
     {
         $holiday = new Holiday;
         $response = $holiday->getRegionHoliday('Selangor')->get();
 
         $this->assertTrue($response['status']);
+        $this->assertTrue($response['data'][0]['regional'] == 'Selangor');
     }
 
     /**
      * To test getting multiple regions holiday
      */
-    function testGetMultipleRegionsHoliday()
+    public function testGetMultipleRegionsHoliday()
     {
         $holiday = new Holiday;
         $response = $holiday->getRegionHoliday(['Selangor', 'Malacca'])->get();
 
-        $this->assertTrue(isset($response['data']['Selangor']));
-        $this->assertTrue(isset($response['data']['Malacca']));
+        $this->assertTrue($response['status']);
+        $this->assertTrue($response['data'][0]['regional'] == 'Selangor');
+        $this->assertTrue($response['data'][1]['regional'] == 'Malacca');
+    }
+
+    /**
+     * To test getting multiple regions holiday
+     */
+    public function testErrorMessage()
+    {
+        $holiday = new Holiday;
+        $response = $holiday->getRegionHoliday(['Selangor', 'Malaccaa'])->get();
+
+        $this->assertTrue($response['status']);
+        $this->assertTrue($response['data'][0]['regional'] == 'Selangor');
+
+
+        $this->assertFalse($response['data'][1]['regional'] == 'Malacca');
+        $this->assertTrue($response['data'][1]['collection'] == []);
+
+        $this->assertCount(1, $response['error_messages']);
+        $this->assertTrue($response['error_messages'][0] == 'Malaccaa is not include in the regional state');
     }
 }
\ No newline at end of file

From 81f743afbec35b1bcfab1e9050784e2f6c0d6a48 Mon Sep 17 00:00:00 2001
From: Hafiq <hafiqiqmal93@gmail.com>
Date: Wed, 2 Oct 2019 16:37:11 +0800
Subject: [PATCH 2/2] delete .idea files

---
 .gitignore                                   |   1 +
 .idea/MalaysiaHoliday.iml                    |  47 -----
 .idea/dictionaries/hafiq.xml                 |   3 -
 .idea/inspectionProfiles/Project_Default.xml |   8 -
 .idea/modules.xml                            |   8 -
 .idea/vcs.xml                                |   6 -
 .idea/workspace.xml                          | 205 -------------------
 .travis.yml                                  |   3 +-
 8 files changed, 3 insertions(+), 278 deletions(-)
 delete mode 100644 .idea/MalaysiaHoliday.iml
 delete mode 100644 .idea/dictionaries/hafiq.xml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.gitignore b/.gitignore
index 4046c1b..804a659 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .env
 .idea
+.idea/*
 coverage.xml
 vendor
\ No newline at end of file
diff --git a/.idea/MalaysiaHoliday.iml b/.idea/MalaysiaHoliday.iml
deleted file mode 100644
index abacd4b..0000000
--- a/.idea/MalaysiaHoliday.iml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/instantiator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/fabpot/goutte" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/guzzle" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/promises" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/psr7" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-common" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-docblock" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/type-resolver" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpspec/prophecy" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-file-iterator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-text-template" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-timer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-token-stream" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit-mock-objects" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-message" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/ralouphie/getallheaders" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/environment" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/exporter" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/global-state" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-enumerator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/resource-operations" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/browser-kit" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/css-selector" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/dom-crawler" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/yaml" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/vlucas/phpdotenv" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/dictionaries/hafiq.xml b/.idea/dictionaries/hafiq.xml
deleted file mode 100644
index 5f8e99f..0000000
--- a/.idea/dictionaries/hafiq.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="hafiq" />
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index b48fa03..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PhpCSValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="CODING_STANDARD" value="PSR2" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 8ec85c5..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/MalaysiaHoliday.iml" filepath="$PROJECT_DIR$/.idea/MalaysiaHoliday.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index eb1737c..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="2cb85e8e-22d7-404a-a917-ddf85cce18f7" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/src/exception/RegionException.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/MalaysiaHoliday.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/MalaysiaHoliday.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/example/index.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Holiday.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Holiday.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tests/HolidayTest.php" beforeDir="false" afterPath="$PROJECT_DIR$/tests/HolidayTest.php" afterDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ComposerSettings" doNotAsk="true">
-    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
-    <execution>
-      <executable path="composer" />
-    </execution>
-  </component>
-  <component name="FileColors">
-    <fileColor scope="Non-Project Files (Material Default)" color="2E3C43" />
-    <fileColor scope="Non-Project Files (Material Darker)" color="323232" />
-    <fileColor scope="Non-Project Files (Material Lighter)" color="eae8e8" />
-    <fileColor scope="Non-Project Files (Material Palenight)" color="2f2e43" />
-    <fileColor scope="Non-Project Files (Material Oceanic)" color="2E3C43" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 7.1">
-    <include_path>
-      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
-      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
-      <path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
-      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
-      <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
-      <path value="$PROJECT_DIR$/vendor/composer" />
-      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
-      <path value="$PROJECT_DIR$/vendor/fabpot/goutte" />
-      <path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
-      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
-      <path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit-mock-objects" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
-      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
-      <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
-      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
-      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
-    </include_path>
-  </component>
-  <component name="ProjectId" id="1RdFxj8dzRrzRTjhzCbMdsT6pM9" />
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>PHP</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>PhpCSValidationInspection</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="ignore_missing_gitignore" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="php.override.implement.member.chooser.php.doc" value="NONE" />
-    <property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager" selected="PHPUnit.RequestTest.testErrorMessage">
-    <configuration name="RequestTest.testErrorMessage" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
-      <TestRunner class="Tests\RequestTest" file="$PROJECT_DIR$/tests/HolidayTest.php" method="testErrorMessage" scope="Method" />
-      <method v="2" />
-    </configuration>
-    <configuration name="RequestTest.testGetAllRegionHoliday" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
-      <TestRunner class="Tests\RequestTest" file="$PROJECT_DIR$/tests/HolidayTest.php" method="testGetAllRegionHoliday" scope="Method" />
-      <method v="2" />
-    </configuration>
-    <configuration name="RequestTest.testGetMultipleRegionsHoliday" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
-      <TestRunner class="Tests\RequestTest" file="$PROJECT_DIR$/tests/HolidayTest.php" method="testGetMultipleRegionsHoliday" scope="Method" />
-      <method v="2" />
-    </configuration>
-    <configuration name="RequestTest.testGetSpecificRegionHoliday" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
-      <TestRunner class="Tests\RequestTest" file="$PROJECT_DIR$/tests/HolidayTest.php" method="testGetSpecificRegionHoliday" scope="Method" />
-      <method v="2" />
-    </configuration>
-    <configuration name="Unnamed" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
-      <TestRunner configuration_file="$PROJECT_DIR$/phpunit.xml" directory="$PROJECT_DIR$/tests" use_alternative_configuration_file="true" />
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="PHPUnit.RequestTest.testErrorMessage" />
-        <item itemvalue="PHPUnit.RequestTest.testGetMultipleRegionsHoliday" />
-        <item itemvalue="PHPUnit.RequestTest.testGetSpecificRegionHoliday" />
-        <item itemvalue="PHPUnit.RequestTest.testGetAllRegionHoliday" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="2cb85e8e-22d7-404a-a917-ddf85cce18f7" name="Default" comment="" />
-      <created>1509004604805</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1509004604805</updated>
-      <workItem from="1509004606855" duration="44000" />
-      <workItem from="1509004674649" duration="950000" />
-      <workItem from="1511084986160" duration="2112000" />
-      <workItem from="1534526676960" duration="2348000" />
-      <workItem from="1534561519168" duration="2990000" />
-      <workItem from="1556597746342" duration="3258000" />
-      <workItem from="1569989319794" duration="11719000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ScopeChooserConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index c268243..2e9d4fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: php
 php:
-  - '7.1'
+  - '7.2'
+  - '7.3'
 
 before_script:
   - composer install --ignore-platform-reqs