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

Author: kotenarok

src/Classes/PathTemplateResolver.php

@@ -8,6 +8,8 @@
 
 namespace Vsch\TranslationManager\Classes;
 
+use Illuminate\Support\Str;
+
 class PathTemplateResolver
 {
  /** @var \Illuminate\Filesystem\Filesystem */
@@ -355,7 +357,7 @@ protected function loadFileList($prefix, $path_parts, $group_parts)
  $prefix = str_replace("\\", "/", $prefix);
 
  for (; ;) {
- $isUnderBaseDir = $prefix == $this->normalized_base_path || starts_with($prefix . '/', $this->normalized_base_path . '/');
+ $isUnderBaseDir = $prefix == $this->normalized_base_path || Str::startsWith($prefix . '/', $this->normalized_base_path . '/');
 
  if (array_key_exists($prefix, $this->processed_dirs) || ($isUnderBaseDir && (!file_exists($prefix) || !is_dir($prefix)))) {
  // already handled this one or it does not exist and not under base dir

src/Controller.php

@@ -680,7 +680,7 @@ protected static function keyGroup($group, $key)
  $prefix = '';
  $gkey = $key;
 
- if (starts_with($key, 'vnd:') || starts_with($key, 'wbn:')) {
+ if (Str::startsWith($key, 'vnd:') || Str::startsWith($key, 'wbn:')) {
  // these have vendor with . afterwards in the group
  $parts = explode('.', $key, 2);
 

src/Manager.php

@@ -391,7 +391,7 @@ public function getGroupAugmentedList()
  $this->augmentedGroupReverseList = [];
 
  foreach ($groupList as $group) {
- if (starts_with($group, ["vnd:", "wbn:"])) {
+ if (Str::startsWith($group, ["vnd:", "wbn:"])) {
  // we need this one
  $parts = explode('.', $group, 2);
  if (count($parts) === 2) {