More changes

.gitignore

@@ -2,3 +2,4 @@
 vendor/
 clover.xml
 mytracedir/
+.phpunit.result.cache

src/BagUtils.php

@@ -66,7 +66,7 @@ private function __construct()
      */
     public static function baseInData(string $path): string
     {
-        if (substr($path, 0, 5) !== 'data/') {
+        if (!str_starts_with($path, 'data/')) {
             $path = "data/" . ltrim($path, "/");
         }
         return $path;
@@ -120,7 +120,7 @@ public static function getAbsolute(string $path, bool $add_absolute = false): st
     {
         $path = self::standardizePathSeparators($path);
         // Check if path start with a separator (UNIX)
-        $startWithSeparator = substr($path, 0, 1) === '/';
+        $startWithSeparator = str_starts_with($path, '/');
         // Check if start with drive letter
         preg_match('/^[a-z]:/i', $path, $matches);
         $startWithLetterDir = $matches[0] ?? false;

tests/ManifestTest.php

@@ -331,7 +331,7 @@ public function testValidatePathOutsideBagCreate(): void
     {
         $bag = Bag::create($this->tmpdir);
         $this->expectException(BagItException::class);
-        $this->expectErrorMessage("Path data/../../pictures/another_picture.txt resolves outside the bag.");
+        $this->expectExceptionMessage("Path data/../../pictures/another_picture.txt resolves outside the bag.");
         $bag->addFile(self::TEST_IMAGE['filename'], "data/../../pictures/another_picture.txt");
     }
 }