Merge remote-tracking branch 'upstream/master'

Conflicts:
	doc/html/classRedmatrix_1_1Import_1_1Import-members.html
	doc/html/classRedmatrix_1_1Import_1_1Import.js

1 files changed, 168 insertions, 0 deletions

diff --git a/library/intl/src/Country/Country.php b/library/intl/src/Country/Country.php
new file mode 100644
index 000000000..5ac65fd0d
--- /dev/null
+++ b/library/intl/src/Country/Country.php
@@ -0,0 +1,168 @@
+<?php
+
+namespace CommerceGuys\Intl\Country;
+
+class Country implements CountryInterface
+{
+    /**
+     * The two-letter country code.
+     *
+     * @var string
+     */
+    protected $countryCode;
+
+    /**
+     * The country name.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * The three-letter country code.
+     *
+     * @var string
+     */
+    protected $threeLetterCode;
+
+    /**
+     * The numeric country code.
+     *
+     * @var string
+     */
+    protected $numericCode;
+
+    /**
+     * The country telephone code.
+     *
+     * @var string
+     */
+    protected $telephoneCode;
+
+    /**
+     * The country locale (i.e. "en_US").
+     *
+     * The country name is locale specific.
+     *
+     * @var string
+     */
+    protected $locale;
+
+    /**
+     * Returns the string representation of the Country.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->getCountryCode();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCountryCode()
+    {
+        return $this->countryCode;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setCountryCode($countryCode)
+    {
+        $this->countryCode = $countryCode;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getThreeLetterCode()
+    {
+        return $this->threeLetterCode;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setThreeLetterCode($threeLetterCode)
+    {
+        $this->threeLetterCode = $threeLetterCode;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getNumericCode()
+    {
+        return $this->numericCode;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setNumericCode($numericCode)
+    {
+        $this->numericCode = $numericCode;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTelephoneCode()
+    {
+        return $this->telephoneCode;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setTelephoneCode($telephoneCode)
+    {
+        $this->telephoneCode = $telephoneCode;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getLocale()
+    {
+        return $this->locale;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setLocale($locale)
+    {
+        $this->locale = $locale;
+
+        return $this;
+    }
+}