Define AMP_DEBUG through environment

amphp · Dec 2, 2017 · 745a95b · 745a95b
1 parent c260e2e
commit 745a95b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,9 @@ matrix:
     - php: nightly
   fast_finish: true
 
+env:
+  - AMP_DEBUG=true
+
 before_install:
   - phpenv config-rm xdebug.ini || echo "No xdebug config."
 

diff --git a/lib/Internal/Placeholder.php b/lib/Internal/Placeholder.php
@@ -84,15 +84,18 @@ private function resolve($value = null) {
                 $trace = formatStacktrace($this->resolutionTrace);
                 $message .= ". Previous resolution trace:\n\n{$trace}\n\n";
             } else {
-                $message .= ", define const AMP_DEBUG = true and enable assertions for a stacktrace of the previous resolution.";
+                // @codeCoverageIgnoreStart
+                $message .= ", define environment variable AMP_DEBUG or const AMP_DEBUG = true and enable assertions "
+                    . "for a stacktrace of the previous resolution.";
+                // @codeCoverageIgnoreEnd
             }
 
             throw new \Error($message);
         }
 
         \assert((function () {
-            if (\defined("AMP_DEBUG") && \AMP_DEBUG) {
-                $trace = \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+            if (\getenv("AMP_DEBUG") || (\defined("AMP_DEBUG") && \AMP_DEBUG)) {
+                $trace = \debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS);
                 \array_shift($trace); // remove current closure
                 $this->resolutionTrace = $trace;
             }

diff --git a/lib/Internal/Producer.php b/lib/Internal/Producer.php
@@ -141,24 +141,23 @@ private function complete() {
             $message = "Iterator has already been completed";
 
             if (isset($this->resolutionTrace)) {
-                // @codeCoverageIgnoreStart
                 $trace = formatStacktrace($this->resolutionTrace);
                 $message .= ". Previous completion trace:\n\n{$trace}\n\n";
-                // @codeCoverageIgnoreEnd
             } else {
-                $message .= ", define const AMP_DEBUG = true and enable assertions for a stacktrace of the previous completion.";
+                // @codeCoverageIgnoreStart
+                $message .= ", define environment variable AMP_DEBUG or const AMP_DEBUG = true and enable assertions "
+                    . "for a stacktrace of the previous resolution.";
+                // @codeCoverageIgnoreEnd
             }
 
             throw new \Error($message);
         }
 
         \assert((function () {
-            if (\defined("AMP_DEBUG") && \AMP_DEBUG) {
-                // @codeCoverageIgnoreStart
-                $trace = \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+            if (\getenv("AMP_DEBUG") || (\defined("AMP_DEBUG") && \AMP_DEBUG)) {
+                $trace = \debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS);
                 \array_shift($trace); // remove current closure
                 $this->resolutionTrace = $trace;
-                // @codeCoverageIgnoreEnd
             }
 
             return true;