Merge pull request #1428 from troosan/parse_short_lang_code

Allow passing short lang code

Author: troosan

.travis.yml

@@ -13,7 +13,7 @@ php:
 
 matrix:
     include:
-        - php: 5.6
+        - php: 7.0
           env: COVERAGE=1
 
 cache:

CHANGELOG.md

@@ -3,7 +3,7 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-v0.15.0 (?? ??? 2018)
+v0.15.0 (14 Jul 2018)
 ----------------------
 ### Added
 - Parsing of `align` HTML attribute - @troosan #1231
@@ -25,6 +25,7 @@ v0.15.0 (?? ??? 2018)
 - Several improvements to charts @JAEK-S #1332
 - Add parsing of html image in base64 format @jgpATs2w #1382
 - Added Support for Indentation & Tabs on RTF Writer. @smaug1985 #1405
+- Allows decimal numbers in HTML line-height style @jgpATs2w #1413
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238

src/PhpWord/Style/Language.php

@@ -123,8 +123,7 @@ public function __construct($latin = null, $eastAsia = null, $bidirectional = nu
      */
     public function setLatin($latin)
     {
-        $this->validateLocale($latin);
-        $this->latin = $latin;
+        $this->latin = $this->validateLocale($latin);
 
         return $this;
     }
@@ -173,8 +172,7 @@ public function getLangId()
      */
     public function setEastAsia($eastAsia)
     {
-        $this->validateLocale($eastAsia);
-        $this->eastAsia = $eastAsia;
+        $this->eastAsia = $this->validateLocale($eastAsia);
 
         return $this;
     }
@@ -198,8 +196,7 @@ public function getEastAsia()
      */
     public function setBidirectional($bidirectional)
     {
-        $this->validateLocale($bidirectional);
-        $this->bidirectional = $bidirectional;
+        $this->bidirectional = $this->validateLocale($bidirectional);
 
         return $this;
     }
@@ -218,12 +215,18 @@ public function getBidirectional()
      * Validates that the language passed is in the format xx-xx
      *
      * @param string $locale
-     * @return bool
+     * @return string
      */
     private function validateLocale($locale)
     {
+        if (strlen($locale) === 2) {
+            return strtolower($locale) . '-' . strtoupper($locale);
+        }
+
         if ($locale !== null && strstr($locale, '-') === false) {
             throw new \InvalidArgumentException($locale . ' is not a valid language code');
         }
+
+        return $locale;
     }
 }

tests/PhpWord/Style/LanguageTest.php

@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Style;
 
+use PHPUnit\Framework\Assert;
+
 /**
  * Test class for PhpOffice\PhpWord\Style\Language
  *
@@ -56,7 +58,20 @@ public function testGetSetProperties()
      */
     public function testWrongLanguage()
     {
+        $language = new Language();
+        $language->setLatin('fra');
+    }
+
+    /**
+     * Tests that a language can be set with just a 2 char code
+     */
+    public function testShortLanguage()
+    {
+        //when
         $language = new Language();
         $language->setLatin('fr');
+
+        //then
+        Assert::assertEquals('fr-FR', $language->getLatin());
     }
 }