.gitea/workflows/build_composer.yaml

@@ -1,29 +0,0 @@
-
-name: Publish PHP Package
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Get tag name
-      run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-    - name: zip and send
-      run: |
-        ls -la
-        apt-get update -y
-        apt-get install -y zip
-        cd ../
-        zip -r ${{ gitea.event.repository.name }}.zip ${{ gitea.event.repository.name }} -x '*.git*'
-        curl -v \
-        --user composer-pbl:${{ secrets.COMPOSER_PSWD }} \
-        --upload-file ${{ gitea.event.repository.name }}.zip \
-        https://git.bit5.ru/api/packages/bit/composer?version=${{ env.TAG }}      

macro.inc.php

@@ -1,21 +1,5 @@
 <?php
 
-/**
- * @global
- */
-function macro_VCLASSID($proc, $class)
-{
-  return '"$id" : ' . constant("$class::CLASS_ID");
-}
-
-/**
- * @global
- */
-function macro_VCLASS($proc, $class)
-{
-  return '"__vclass" : ' . constant("$class::CLASS_ID");
-}
-
 /**
  * @global
  */
@@ -81,6 +65,7 @@ function macro_WEEK_DATE($proc, $spec)
       break;
     default:
       throw new Exception("Bad day of week: $spec");
+      break;
   }
 
   $stamp = strtotime($time_str);
@@ -211,10 +196,15 @@ function macro_IS_DEV($jsm)
  */
 function macro_PROP($jsm, $expr)
 {
-  $res = \taskman\get($expr);
+  return \taskman\get($expr);
-  if(is_string($res))
+}
-    return '"'.$res.'"';
+
-  return $res;
+/**
+ * @global
+ */
+function macro_VCLASS($proc, $class)
+{
+  return '"vclass__" : ' . constant("$class::CLASS_ID");
 }
 
 /**