Merge branch 'Laravel-7.x' into Laravel-8.x

Author: kotenarok

src/Controller.php

@@ -12,6 +12,7 @@
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\View;
+use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Vsch\TranslationManager\Classes\TranslationLocales;
 use Vsch\TranslationManager\Events\TranslationsPublished;
@@ -245,7 +246,7 @@ public function isLocaleEnabled($locale)
  $packLocales = TranslationLocales::packLocales($this->transLocales->userLocales);
  if (!is_array($locale)) $locale = array($locale);
  foreach ($locale as $item) {
- if (!str_contains($packLocales, ',' . $item . ',')) return false;
+ if (!Str::contains($packLocales, ',' . $item . ',')) return false;
  }
  return true;
  }

src/Manager.php

@@ -12,6 +12,7 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Str;
 use Symfony\Component\Finder\Finder;
 use Vsch\TranslationManager\Classes\PathTemplateResolver;
 use Vsch\TranslationManager\Classes\TranslationFileRewriter;
@@ -656,7 +657,7 @@ public function cachedTranslations($namespace, $group, $locale, $translations =
  $localePrefix = "$locale:";
  $prefixLen = strlen($localePrefix);
  foreach ($values as $key => $translation) {
- if (str_starts_with($key, $localePrefix)) {
+ if (Str::startsWith($key, $localePrefix)) {
  $transKey = substr($key, $prefixLen);
  $translations[$transKey] = $translation;
  }
@@ -1297,8 +1298,8 @@ function findTranslations($path = null)
  foreach ($matches[3] as $index => $key) {
  $quote = $matches[2][$index][0];
  $keyValue = $key[0];
- if ($quote == '\'' && !str_contains($keyValue, ["\"", "'", "->",]) ||
- $quote == '"' && !str_contains($keyValue, ["$", "\"", "'", "->",])
+ if ($quote == '\'' && !Str::contains($keyValue, ["\"", "'", "->",]) ||
+ $quote == '"' && !Str::contains($keyValue, ["$", "\"", "'", "->",])
  ) {
  if ($fileLines == null) {
  $fileLines = self::computeFileLines($fileContents);