Merge pull request #152 from seboettg/feature/151-styles-locales-via-…

…composer #151 use composer to fetch csl locales and styles
seboettg · Mar 24, 2023 · 116b470 · 116b470
2 parents bd92689 + e59c7d7
commit 116b470
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 70 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,46 @@
+# PHP CircleCI 2.0 configuration file
+# See: https://circleci.com/docs/2.0/language-php/
+version: 2
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  build:
+    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
+    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
+    docker:
+      # Specify the version you desire here
+      - image: cimg/php:8.0.28
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # Using the RAM variation mitigates I/O contention
+      # for database intensive operations.
+      # - image: circleci/mysql:5.7-ram
+      #
+      # - image: redis:2.8.19
+
+    # Add steps to the job
+    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+    steps:
+      - checkout
+
+      - run: sudo apt update # PHP CircleCI 2.0 Configuration File# PHP CircleCI 2.0 Configuration File sudo apt install zlib1g-dev libsqlite3-dev
+      - run: sudo docker-php-ext-install zip
+      - run: sudo docker-php-ext-install intl
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            # "composer.lock" can be used if it is committed to the repo
+            - v1-dependencies-{{ checksum "composer.json" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+
+      - run: composer install -n --prefer-dist
+
+      - save_cache:
+          key: v1-dependencies-{{ checksum "composer.json" }}
+          paths:
+            - ./vendor
+      - run: composer test
diff --git a/.github/workflows/php.yml.template b/.github/workflows/php.yml.template
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/composer.json b/composer.json
@@ -27,6 +27,8 @@
         }
     },
     "require": {
+        "citation-style-language/styles": "v0.0.*",
+        "citation-style-language/locales": "v0.0.*",
         "seboettg/collection": ">=v3.1.0",
         "myclabs/php-enum": "^1.8",
         "ext-simplexml": "*",
@@ -46,14 +48,10 @@
     },
     "scripts": {
         "post-install-cmd": [
-            "./install.sh styles",
-            "./install.sh locales",
             "@compile-test-cases",
             "chmod +x vendor/bin/phpunit"
         ],
         "post-update-cmd": [
-            "./install.sh styles",
-            "./install.sh locales",
             "@compile-test-cases",
             "chmod +x vendor/bin/phpunit"
         ],

diff --git a/install.sh b/install.sh
diff --git a/tests/fixtures/basic-tests/processor-tests/humans/bugfix-github-143.txt b/tests/fixtures/basic-tests/processor-tests/humans/bugfix-github-143.txt
@@ -1249,8 +1249,8 @@ bibliography
                 "given": "John"
             }
         ],
-        "title": "こんにちは世界",
         "id": "ITEM-2",
+        "title": "こんにちは世界",
         "type": "book"
     }
 ]

diff --git a/tests/fixtures/basic-tests/processor-tests/humans/bugfix-github-145.txt b/tests/fixtures/basic-tests/processor-tests/humans/bugfix-github-145.txt
@@ -1246,56 +1246,56 @@ bibliography
         "author": [
             {
                 "family": "First",
-               "given": "James"
+                "given": "James"
             },
             {
                 "family": "Second",
-               "given": "Jay"
+                "given": "Jay"
             },
             {
                 "family": "Third",
-               "given": "John"
+                "given": "John"
             },
             {
                 "family": "Fourth",
-               "given": "Jack"
+                "given": "Jack"
             },
             {
                 "family": "Fifth",
-               "given": "Jacob"
+                "given": "Jacob"
             },
             {
                 "family": "Sixth",
-               "given": "Joseph"
+                "given": "Joseph"
             },
             {
                 "family": "Seventh",
-               "given": "Julian"
+                "given": "Julian"
             },
             {
                 "family": "Eighth",
-               "given": "Jayden"
+                "given": "Jayden"
             },
             {
                 "family": "Ninth",
-               "given": "Jackson"
+                "given": "Jackson"
             },
             {
                 "family": "Tenth",
-               "given": "Jasper"
+                "given": "Jasper"
             },
             {
                 "family": "Eleventh",
-               "given": "Jonathan"
+                "given": "Jonathan"
             },
             {
                 "family": "Twelfth",
-               "given": "Jeremiah"
+                "given": "Jeremiah"
             }
         ],
         "id": "ITEM-1",
-        "type": "book",
-        "title": "Test"
+        "title": "Test",
+        "type": "book"
     }
 ]
 <<===== INPUT =====<<