Merge pull request #16 from koriym/stage

"stage" context does not clear tmp folder
bearsunday · Jul 24, 2017 · f4f2df9 · f4f2df9
2 parents f478c30 + 02d33b4
commit f4f2df9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,5 @@ nbproject
 cache.properties
 build
 vendor/
-composer.phar
-
+composer.lock
 .php_cs.cache
diff --git a/src/AppMeta.php b/src/AppMeta.php
@@ -33,8 +33,8 @@ public function __construct($name, $context = 'app', $appDir = null)
         if (! file_exists($this->logDir) && mkdir($this->logDir) && ! is_writable($this->logDir)) {
             throw new NotWritableException($this->logDir);
         }
-        $isDevelop = strpos($context, 'prod') === false;
-        if ($isDevelop) {
+        $isCacheable = is_int(strpos($context, 'prod-')) || is_int(strpos($context, 'stage-'));
+        if (! $isCacheable) {
             $this->clearTmpDirectory($this->tmpDir);
         }
     }

diff --git a/tests/AppMetaTest.php b/tests/AppMetaTest.php
@@ -6,6 +6,7 @@
  */
 namespace BEAR\AppMeta;
 
+use BEAR\AppMeta\Exception\AppNameException;
 use PHPUnit\Framework\TestCase;
 
 class AppMetaTest extends TestCase
@@ -56,11 +57,9 @@ public function testAppReflectorResourceList()
         $this->assertSame($expect, $files);
     }
 
-    /**
-     * @expectedException \BEAR\AppMeta\Exception\AppNameException
-     */
     public function testInvalidName()
     {
+        $this->expectException(AppNameException::class);
         new AppMeta('Invalid\Invalid');
     }