diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 909fdb44db6f264f20b310e4566d07329060ddd6..e903530a3e865f89dac2e5be1e4193c3c9745dce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,16 @@ -test:app: +test:php74: script: - - bash build.sh \ No newline at end of file + - bash build.sh + except: + - tags + tags: + - docker + + +test:php81: + script: + - bash build.sh + except: + - tags + tags: + - docker \ No newline at end of file diff --git a/src/Storm/Model/Abstract.php b/src/Storm/Model/Abstract.php index 93a4964faa7988ec605a0231fd5805f34fe3ee6c..c742e97b1eba7c3fe34669fe56d94be4efaf3a92 100644 --- a/src/Storm/Model/Abstract.php +++ b/src/Storm/Model/Abstract.php @@ -39,7 +39,7 @@ abstract class Storm_Model_Abstract { /** * @var string */ - protected $_table_primary = null; + protected $_table_primary = 'id'; /** * @var array @@ -1491,4 +1491,4 @@ abstract class Storm_Model_Abstract { public function isFixedId() { return $this->_fixed_id; } -} \ No newline at end of file +} diff --git a/tests/Storm/Model/EventTriggeringTest.php b/tests/Storm/Model/EventTriggeringTest.php index b1331b238277489aec6565e7603128b501bc503a..2d5a713140a70ee5b343960389db8f4975ab03a8 100644 --- a/tests/Storm/Model/EventTriggeringTest.php +++ b/tests/Storm/Model/EventTriggeringTest.php @@ -125,7 +125,9 @@ class Storm_Model_EventTriggeringInvokableTest extends Storm_Model_EventTriggeri -class Storm_Model_EventTriggeringModel extends Storm_Model_Abstract {} +class Storm_Model_EventTriggeringModel extends Storm_Model_Abstract { + protected $_table_primary = 'id'; +} @@ -141,4 +143,4 @@ class Storm_Model_EventTriggeringInvokable { public function __invoke($event) { $this->_test->beCalled(); } -} \ No newline at end of file +} diff --git a/zf b/zf index 87adcfb235fe76a155b926d0cbbe493ce28bcd80..fa9235f7d4dc0ef76283cf195304026feb0e4486 160000 --- a/zf +++ b/zf @@ -1 +1 @@ -Subproject commit 87adcfb235fe76a155b926d0cbbe493ce28bcd80 +Subproject commit fa9235f7d4dc0ef76283cf195304026feb0e4486