Merge remote-tracking branch 'upstream/4.x' into vuejs-utf8-fix

# Conflicts:
#	tests/AssetsTest.php

Author: MBriedis

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Previous releases are documented in [github releases](https://github.com/oscarotero/Gettext/releases)
 
+## [4.8.1] - 2019-11-15
+### Fixed
+- Php error when scanning for a single domain but other string found [#238]
+
 ## [4.8.0] - 2019-11-04
 ### Changed
 - Many `private` properties and methods were changed to `protected` in order to improve the extensibility [#231]
@@ -145,7 +149,9 @@ Previous releases are documented in [github releases](https://github.com/oscarot
 [#226]: https://github.com/oscarotero/Gettext/issues/226
 [#230]: https://github.com/oscarotero/Gettext/issues/230
 [#231]: https://github.com/oscarotero/Gettext/issues/231
+[#238]: https://github.com/oscarotero/Gettext/issues/238
 
+[4.8.1]: https://github.com/oscarotero/Gettext/compare/v4.8.0...v4.8.1
 [4.8.0]: https://github.com/oscarotero/Gettext/compare/v4.7.0...v4.8.0
 [4.7.0]: https://github.com/oscarotero/Gettext/compare/v4.6.3...v4.7.0
 [4.6.3]: https://github.com/oscarotero/Gettext/compare/v4.6.2...v4.6.3

src/Utils/FunctionsScanner.php

@@ -70,7 +70,7 @@ public function saveGettextFunctions($translations, array $options)
                 continue;
             }
 
-            if (!$isDefaultDomain && !$domainTranslations) {
+            if (!$domainTranslations) {
                 continue;
             }
 

tests/AssetsTest.php

@@ -548,6 +548,15 @@ public function testVueJs2MultipleDomainScanning()
         }
     }
 
+    public function testMissingDomainScanWithOtherStringsInFile()
+    {
+        $translations = (new Translations())->setDomain('unknown-domain');
+
+        PhpCode::fromFileMultiple(static::asset('phpcode6/input.php'), [$translations]);
+
+        self::assertCount(0, $translations);
+    }
+
     public function testVueJsUtf8Scanning()
     {
         $translations = new Translations();
@@ -592,6 +601,6 @@ public function testXliffUnitIds()
 
         // Converting from an XLIFF that contains duplicate <source> elements
         // to a PO file will result in the loss of the duplicates.
-        $this->runTestFormat('xliff/Po', $countTranslations-1, $countTranslated-1, $countHeaders);
+        $this->runTestFormat('xliff/Po', $countTranslations - 1, $countTranslated - 1, $countHeaders);
     }
 }

tests/assets/phpcode6/input.php

@@ -0,0 +1,6 @@
+<?php
+
+pgettext('context', 'Text with context');
+_('No domain text');
+
+dgettext('other', 'Other domain text');