@@ -58,7 +58,8 @@ |
||
58 | 58 | */ |
59 | 59 | class E4xx_OutputFilenameIsAReservedName extends Exxx_Exception |
60 | 60 | { |
61 | - public function __construct($filename) { |
|
61 | + public function __construct($filename) |
|
62 | + { |
|
62 | 63 | $msg = "'{$filename}' is reserved for internal use; please use a different filename"; |
63 | 64 | parent::__construct(400, $msg, $msg); |
64 | 65 | } |
@@ -64,7 +64,7 @@ |
||
64 | 64 | public function doPhase($phaseResults) |
65 | 65 | { |
66 | 66 | // shorthand |
67 | - $st = $this->st; |
|
67 | + $st = $this->st; |
|
68 | 68 | |
69 | 69 | // our result object |
70 | 70 | $phaseResult = $this->getNewPhaseResult(); |
@@ -57,7 +57,8 @@ |
||
57 | 57 | */ |
58 | 58 | class E4xx_StoryShouldFail extends Exxx_Exception |
59 | 59 | { |
60 | - public function __construct() { |
|
60 | + public function __construct() |
|
61 | + { |
|
61 | 62 | $msg = "Story should fail"; |
62 | 63 | parent::__construct(400, $msg, $msg); |
63 | 64 | } |
@@ -57,7 +57,8 @@ |
||
57 | 57 | */ |
58 | 58 | class E4xx_StoryShouldFail extends Exxx_Exception |
59 | 59 | { |
60 | - public function __construct() { |
|
60 | + public function __construct() |
|
61 | + { |
|
61 | 62 | $msg = "Story should fail"; |
62 | 63 | parent::__construct(400, $msg, $msg); |
63 | 64 | } |
@@ -57,7 +57,8 @@ |
||
57 | 57 | */ |
58 | 58 | class E4xx_StoryShouldFail extends Exxx_Exception |
59 | 59 | { |
60 | - public function __construct() { |
|
60 | + public function __construct() |
|
61 | + { |
|
61 | 62 | $msg = "Story should fail"; |
62 | 63 | parent::__construct(400, $msg, $msg); |
63 | 64 | } |
@@ -57,7 +57,8 @@ |
||
57 | 57 | */ |
58 | 58 | class E4xx_StoryShouldFail extends Exxx_Exception |
59 | 59 | { |
60 | - public function __construct() { |
|
60 | + public function __construct() |
|
61 | + { |
|
61 | 62 | $msg = "Story should fail"; |
62 | 63 | parent::__construct(400, $msg, $msg); |
63 | 64 | } |
@@ -57,7 +57,8 @@ |
||
57 | 57 | */ |
58 | 58 | class E4xx_StoryShouldFail extends Exxx_Exception |
59 | 59 | { |
60 | - public function __construct() { |
|
60 | + public function __construct() |
|
61 | + { |
|
61 | 62 | $msg = "Story should fail"; |
62 | 63 | parent::__construct(400, $msg, $msg); |
63 | 64 | } |
@@ -57,7 +57,8 @@ |
||
57 | 57 | */ |
58 | 58 | class E4xx_StoryShouldFail extends Exxx_Exception |
59 | 59 | { |
60 | - public function __construct() { |
|
60 | + public function __construct() |
|
61 | + { |
|
61 | 62 | $msg = "Story should fail"; |
62 | 63 | parent::__construct(400, $msg, $msg); |
63 | 64 | } |
@@ -622,18 +622,18 @@ |
||
622 | 622 | // tell the template which story it is being used with |
623 | 623 | $tmpl->setStory($this); |
624 | 624 | |
625 | - $tmpl->hasTestCanRunCheck() && $this->addTestCanRunCheck($tmpl->getTestCanRunCheck()); |
|
626 | - $tmpl->hasTestSetup() && $this->addTestSetup($tmpl->getTestSetup()); |
|
627 | - $tmpl->hasTestTeardown() && $this->addTestTeardown($tmpl->getTestTeardown()); |
|
628 | - $tmpl->hasPerPhaseSetup() && $this->addPerPhaseSetup($tmpl->getPerPhaseSetup()); |
|
629 | - $tmpl->hasPerPhaseTeardown() && $this->addPerPhaseTeardown($tmpl->getPerPhaseTeardown()); |
|
630 | - $tmpl->hasDeviceSetup() && $this->addDeviceSetup($tmpl->getDeviceSetup()); |
|
631 | - $tmpl->hasDeviceTeardown() && $this->addDeviceTeardown($tmpl->getDeviceTeardown()); |
|
632 | - $tmpl->hasHints() && $this->addHints($tmpl->getHints()); |
|
633 | - $tmpl->hasPreTestPrediction() && $this->addPreTestPrediction($tmpl->getPreTestPrediction()); |
|
634 | - $tmpl->hasPreTestInspection() && $this->addPreTestInspection($tmpl->getPreTestInspection()); |
|
635 | - $tmpl->hasAction() && $this->addAction($tmpl->getAction()); |
|
636 | - $tmpl->hasPostTestInspection() && $this->addPostTestInspection($tmpl->getPostTestInspection()); |
|
625 | + $tmpl->hasTestCanRunCheck() && $this->addTestCanRunCheck($tmpl->getTestCanRunCheck()); |
|
626 | + $tmpl->hasTestSetup() && $this->addTestSetup($tmpl->getTestSetup()); |
|
627 | + $tmpl->hasTestTeardown() && $this->addTestTeardown($tmpl->getTestTeardown()); |
|
628 | + $tmpl->hasPerPhaseSetup() && $this->addPerPhaseSetup($tmpl->getPerPhaseSetup()); |
|
629 | + $tmpl->hasPerPhaseTeardown() && $this->addPerPhaseTeardown($tmpl->getPerPhaseTeardown()); |
|
630 | + $tmpl->hasDeviceSetup() && $this->addDeviceSetup($tmpl->getDeviceSetup()); |
|
631 | + $tmpl->hasDeviceTeardown() && $this->addDeviceTeardown($tmpl->getDeviceTeardown()); |
|
632 | + $tmpl->hasHints() && $this->addHints($tmpl->getHints()); |
|
633 | + $tmpl->hasPreTestPrediction() && $this->addPreTestPrediction($tmpl->getPreTestPrediction()); |
|
634 | + $tmpl->hasPreTestInspection() && $this->addPreTestInspection($tmpl->getPreTestInspection()); |
|
635 | + $tmpl->hasAction() && $this->addAction($tmpl->getAction()); |
|
636 | + $tmpl->hasPostTestInspection() && $this->addPostTestInspection($tmpl->getPostTestInspection()); |
|
637 | 637 | |
638 | 638 | // remember this template for future use |
639 | 639 | $this->storyTemplates[] = $tmpl; |
@@ -1137,8 +1137,7 @@ |
||
1137 | 1137 | public function getOneAction() |
1138 | 1138 | { |
1139 | 1139 | // do we have any callbacks to pick from? |
1140 | - if (count($this->actionsCallbacks) == 0) |
|
1141 | - { |
|
1140 | + if (count($this->actionsCallbacks) == 0) { |
|
1142 | 1141 | throw new E5xx_NoStoryActions($this->getName()); |
1143 | 1142 | } |
1144 | 1143 |
@@ -700,6 +700,7 @@ |
||
700 | 700 | } |
701 | 701 | |
702 | 702 | /** |
703 | + * @param integer $version |
|
703 | 704 | * @return Story |
704 | 705 | */ |
705 | 706 | public function requiresStoryplayerVersion($version) |