Merge pull request #6 from trurl-master/master

Make it compatible with table modifying behaviors

Author: JASchilz

src/PropelJSBehavior.php

@@ -12,6 +12,8 @@ class PropelJSBehavior extends Behavior
     /** @var  PluralizerInterface */
     protected $pluralizer;
 
+    private static $tablesProcessed = 0;
+
     /**
      * @return PluralizerInterface
      */
@@ -22,10 +24,18 @@ public function getPluralizer() {
 
         return $this->pluralizer;
     }
+
+    public function modifyTable()
+    {
+        self::$tablesProcessed++;
+
+        if (self::$tablesProcessed === count($this->getTables())) {
+            self::execute();
+        }
+    }
 
-    public function modifyDatabase()
+    public function execute()
     {
-        parent::modifyDatabase();
 
         $jsDirectory = getcwd() . '/generated-js';
         $apiDirectory = getcwd() . '/generated-api';

src/templates/API.php

@@ -144,7 +144,7 @@ public static function getAction()
     /**
      * @return ModelCriteria
      */
-    public function getQueryOr404()
+    public static function getQueryOr404()
     {
         if (static::$query === null) {
             $resourceName = static::getResourceName();