Merge remote-tracking branch 'origin/master' into upstream-8.3.0

* origin/master:
  Add test to show problem and how it is fixed.
  Remove extra !
  Exclude all data directories in classmap
  Exclude "/src/geocoding/data/" from autoload

composer.json

@@ -27,7 +27,14 @@
   "autoload": {
     "psr-4": {
       "libphonenumber\\": "src/"
-    }
+    },
+    "exclude-from-classmap": [
+        "/src/data/",
+        "/src/carrier/data/",
+        "/src/geocoding/data/",
+        "/src/timezone/data/"
+    ]
+
   },
   "autoload-dev": {
     "psr-4": {

src/PhoneNumberToTimeZonesMapper.php

@@ -90,7 +90,7 @@ public function getTimeZonesForNumber(PhoneNumber $number)
 
         if ($numberType === PhoneNumberType::UNKNOWN) {
             return $this->unknownTimeZoneList;
-        } elseif (!!PhoneNumberUtil::getInstance()->isNumberGeographical($numberType, $number->getCountryCode())) {
+        } elseif (!PhoneNumberUtil::getInstance()->isNumberGeographical($numberType, $number->getCountryCode())) {
             return $this->getCountryLevelTimeZonesforNumber($number);
         }
 

tests/Issues/Issue159Test.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace libphonenumber\Tests\Issues;
+
+use libphonenumber\PhoneNumber;
+use libphonenumber\PhoneNumberToTimeZonesMapper;
+use libphonenumber\PhoneNumberUtil;
+
+/**
+ * Test that an extra not operator is messing up timezone lookup
+ * @see https://github.com/giggsey/libphonenumber-for-php/issues/159
+ * @package libphonenumber\Tests\Issues
+ */
+class Issue159Test extends \PHPUnit_Framework_TestCase
+{
+    const LOS_ANGELES_TZ = "America/Los_Angeles";
+
+    public function setUp()
+    {
+        // Reset instance each time
+        PhoneNumberUtil::resetInstance();
+    }
+
+    public function testLookupTZ_LA()
+    {
+        $number = new PhoneNumber();
+        $number->setCountryCode(1)->setNationalNumber(2082924565);
+
+        $timeZoneMapper = PhoneNumberToTimeZonesMapper::getInstance();
+
+        $this->assertEquals(array(self::LOS_ANGELES_TZ), $timeZoneMapper->getTimeZonesForNumber($number));
+    }
+}