Move IS_[FILE|FOLDER|LINK] constants to Sources class

Author: thekid

src/main/php/xp/lambda/PackageLambda.class.php

@@ -9,11 +9,6 @@
 class PackageLambda {
   const COMPRESSION_THRESHOLD= 24;
 
-  // See https://www.php.net/manual/en/function.fileperms.php
-  const IS_LINK= 0120000;
-  const IS_FILE= 0100000;
-  const IS_FOLDER= 0040000;
-
   private $target, $sources, $exclude, $compression;
 
   public function __construct(Path $target, Sources $sources, string $exclude= '#(^|/)(\..+|src/test|src/it)(/|$)#') {
@@ -42,13 +37,13 @@ private function add(ZipArchiveWriter $zip, Path $path, Path $base, $prefix= '')
     // - Links: Resolve, then handle link targets
     // - Files: Add to ZIP
     // - Folders: Recursively add all subfolders and files therein
-    if (self::IS_LINK === ($stat['mode'] & self::IS_LINK)) {
+    if (Sources::IS_LINK === ($stat['mode'] & Sources::IS_LINK)) {
       $resolved= Path::real([dirname($path), readlink($path)], $base);
       if ($resolved->exists()) {
         $base= $resolved->isFile() ? new Path(dirname($resolved)) : $resolved;
         yield from $this->add($zip, $resolved, $base, $relative.DIRECTORY_SEPARATOR);
       }
-    } else if (self::IS_FILE === ($stat['mode'] & self::IS_FILE)) {
+    } else if (Sources::IS_FILE === ($stat['mode'] & Sources::IS_FILE)) {
       $file= $zip->add(new ZipFileEntry($relative));
 
       // See https://stackoverflow.com/questions/46716095/minimum-file-size-for-compression-algorithms
@@ -57,7 +52,7 @@ private function add(ZipArchiveWriter $zip, Path $path, Path $base, $prefix= '')
       }
       (new StreamTransfer($path->asFile()->in(), $file->out()))->transferAll();
       yield $file;
-    } else if (self::IS_FOLDER === ($stat['mode'] & self::IS_FOLDER)) {
+    } else if (Sources::IS_FOLDER === ($stat['mode'] & Sources::IS_FOLDER)) {
       yield $zip->add(new ZipDirEntry($relative));
       foreach ($path->asFolder()->entries() as $entry) {
         yield from $this->add($zip, $entry, $base, $prefix);

src/main/php/xp/lambda/Sources.class.php

@@ -5,6 +5,12 @@
 
 /** Returns a unique list of sources */
 class Sources implements IteratorAggregate {
+
+  // See https://www.php.net/manual/en/function.fileperms.php
+  const IS_LINK= 0120000;
+  const IS_FILE= 0100000;
+  const IS_FOLDER= 0040000;
+
   public $base;
   private $sources;
 

src/test/php/com/amazon/aws/lambda/unittest/PackagingTest.class.php

@@ -22,9 +22,9 @@ private function cleanup(Folder $folder= null) {
     $folder ?? $folder= $this->tempDir;
     foreach ($folder->entries() as $entry) {
       switch ($m= lstat($entry)['mode'] & 0170000) {
-        case PackageLambda::IS_LINK: unlink($entry); break;
-        case PackageLambda::IS_FILE: $entry->asFile()->unlink(); break;
-        case PackageLambda::IS_FOLDER: $this->cleanup($entry->asFolder()); break;
+        case Sources::IS_LINK: unlink($entry); break;
+        case Sources::IS_FILE: $entry->asFile()->unlink(); break;
+        case Sources::IS_FOLDER: $this->cleanup($entry->asFolder()); break;
       }
     }
   }
@@ -35,15 +35,15 @@ private function create(array $definitions): Path {
     // Create sources from definitions
     foreach ($definitions as $name => $definition) {
       switch ($definition[0]) {
-        case PackageLambda::IS_FILE:
+        case Sources::IS_FILE:
           Files::write(new File($this->tempDir, $name), $definition[1]);
           break;
 
-        case PackageLambda::IS_FOLDER:
+        case Sources::IS_FOLDER:
           (new Folder($this->tempDir, $name))->create($definition[1]);
           break;
 
-        case PackageLambda::IS_LINK:
+        case Sources::IS_LINK:
           symlink($definition[1], new Path($this->tempDir, $name));
           break;
       }
@@ -71,7 +71,7 @@ private function package(Sources $sources): ZipIterator {
 
   #[Test]
   public function single_file() {
-    $zip= $this->package(new Sources($this->create(['file.txt' => [PackageLambda::IS_FILE, 'Test']]), ['file.txt']));
+    $zip= $this->package(new Sources($this->create(['file.txt' => [Sources::IS_FILE, 'Test']]), ['file.txt']));
 
     $file= $zip->next();
     Assert::equals('file.txt', $file->getName());
@@ -81,7 +81,7 @@ public function single_file() {
 
   #[Test]
   public function single_directory() {
-    $zip= $this->package(new Sources($this->create(['src' => [PackageLambda::IS_FOLDER, 0755]]), ['src']));
+    $zip= $this->package(new Sources($this->create(['src' => [Sources::IS_FOLDER, 0755]]), ['src']));
 
     $dir= $zip->next();
     Assert::equals('src/', $dir->getName());
@@ -92,8 +92,8 @@ public function single_directory() {
   #[Test]
   public function file_inside_directory() {
     $path= $this->create([
-      'src'          => [PackageLambda::IS_FOLDER, 0755],
-      'src/file.txt' => [PackageLambda::IS_FILE, 'Test']
+      'src'          => [Sources::IS_FOLDER, 0755],
+      'src/file.txt' => [Sources::IS_FILE, 'Test']
     ]);
     $zip= $this->package(new Sources($path, ['src']));
 
@@ -111,13 +111,13 @@ public function file_inside_directory() {
   #[Test]
   public function link_inside_directory() {
     $path= $this->create([
-      'core/'                => [PackageLambda::IS_FOLDER, 0755],
-      'core/composer.json'   => [PackageLambda::IS_FILE, '{"require":{"php":">=7.0"}}'],
-      'project'              => [PackageLambda::IS_FOLDER, 0755],
-      'project/src'          => [PackageLambda::IS_FOLDER, 0755],
-      'project/src/file.txt' => [PackageLambda::IS_FILE, 'Test'],
-      'project/lib'          => [PackageLambda::IS_FOLDER, 0755],
-      'project/lib/core'     => [PackageLambda::IS_LINK, '../../core'],
+      'core/'                => [Sources::IS_FOLDER, 0755],
+      'core/composer.json'   => [Sources::IS_FILE, '{"require":{"php":">=7.0"}}'],
+      'project'              => [Sources::IS_FOLDER, 0755],
+      'project/src'          => [Sources::IS_FOLDER, 0755],
+      'project/src/file.txt' => [Sources::IS_FILE, 'Test'],
+      'project/lib'          => [Sources::IS_FOLDER, 0755],
+      'project/lib/core'     => [Sources::IS_LINK, '../../core'],
     ]);
     $zip= $this->package(new Sources(new Path($path, 'project'), ['src', 'lib']));