From 29300e30649808f165a67897c8fb0a7866762553 Mon Sep 17 00:00:00 2001
From: Felipe Figueroa <amenadiel@gmail.com>
Date: Tue, 27 Apr 2021 00:58:44 -0400
Subject: [PATCH] adds codecov

last chance for scrutinizer
---
 .github/workflows/coverage.yml |  28 ++++-
 .scrutinizer.yml               |   4 +-
 Examples/example_parser.js     | 189 +++++++++++++++------------------
 README.md                      |   3 +-
 sonar-project.properties       |  14 +++
 5 files changed, 130 insertions(+), 108 deletions(-)
 create mode 100644 sonar-project.properties

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 37e88c2d..bf572ecf 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -1,8 +1,23 @@
 name: coverage
 
-on: ['pull_request']
-
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    types: [opened, synchronize, reopened]
 jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}    
   coverage:
     runs-on: 'ubuntu-latest'
     strategy:
@@ -42,4 +57,11 @@ jobs:
 
     - name: Coverage
       run: composer coverage
-      if: "matrix.php == 7.4"
\ No newline at end of file
+      if: "matrix.php == 7.4"
+
+
+    - uses: codecov/codecov-action@v1
+      with:
+        files: ./tests/_output/coverage.xml
+        fail_ci_if_error: true # optional (default = false)
+        verbose: true # optional (default = false)
\ No newline at end of file
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 2cdd54dd..1dcbb1b1 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -4,8 +4,8 @@ build:
     environment:
           php:
             version: '7.4'
-            ini:
-                'zend_extension': 'xdebug.so'
+
+
     nodes:
         tests: true
         analysis:
diff --git a/Examples/example_parser.js b/Examples/example_parser.js
index efe3d3a8..3e71627e 100755
--- a/Examples/example_parser.js
+++ b/Examples/example_parser.js
@@ -1,111 +1,96 @@
 var files_arr = JSON.parse(window.files);
 
-var filesmenu = _.reduce(
-    files_arr,
-    function(accum, file) {
-        var foldername = file
-                .split("/")[0]
-                .split("_")
-                .join(" "),
-            folder = file.split("/")[0],
-            testName = folder.split("_")[1],
-            testName =
-                "tests/" +
-                testName[0].toUpperCase() +
-                testName.substring(1) +
-                "Test.php";
-        accum[folder] = accum[folder] || {
-            foldername: foldername,
-            examples: []
-        };
-        accum[folder].examples.push(file);
-        return accum;
-    },
-    {}
-);
+let filesmenu = _.reduce(
+  files_arr,
+  function (accum, file) {
+    let foldername = file.split("/")[0].split("_").join(" "),
+      folder = file.split("/")[0];
 
-jQuery(document).ready(function() {
-    var createCard = function(index, title) {
-        var card = jQuery('<div class="card"/>');
-        var card_header = jQuery(
-            '<div class="card-header" role="tab" id="heading' + index + '">'
-        );
-        var h5 = jQuery('<h5 class="mb-0"/>');
-        var data_toggle = jQuery(
-            '<a class="collapsed" data-toggle="collapse" data-parent="#accordion" href=""  aria-controls="collapse' +
-                index +
-                '">'
-        );
-        data_toggle.text(title);
-        data_toggle.attr("href", "#collapse" + index);
-        data_toggle.appendTo(h5);
-        h5.appendTo(card_header);
-        card_header.appendTo(card);
-        var collapse = jQuery(
-            '<div id="collapse' +
-                index +
-                '" class="collapse" role="tabpanel" aria-labelledby="heading' +
-                index +
-                '"/>'
-        );
-        var card_block = jQuery('<div class="card-block"/>');
-        var ul = jQuery("<ul/>");
-        ul.appendTo(card_block);
-        card_block.appendTo(collapse);
-        collapse.appendTo(card);
-        return card;
+    accum[folder] = accum[folder] || {
+      foldername: foldername,
+      examples: [],
     };
+    accum[folder].examples.push(file);
+    return accum;
+  },
+  {}
+);
+
+jQuery(document).ready(function () {
+  var createCard = function (index, title) {
+    var card = jQuery('<div class="card"/>');
+    var card_header = jQuery(
+      '<div class="card-header" role="tab" id="heading' + index + '">'
+    );
+    var h5 = jQuery('<h5 class="mb-0"/>');
+    var data_toggle = jQuery(
+      '<a class="collapsed" data-toggle="collapse" data-parent="#accordion" href=""  aria-controls="collapse' +
+        index +
+        '">'
+    );
+    data_toggle.text(title);
+    data_toggle.attr("href", "#collapse" + index);
+    data_toggle.appendTo(h5);
+    h5.appendTo(card_header);
+    card_header.appendTo(card);
+    var collapse = jQuery(
+      '<div id="collapse' +
+        index +
+        '" class="collapse" role="tabpanel" aria-labelledby="heading' +
+        index +
+        '"/>'
+    );
+    var card_block = jQuery('<div class="card-block"/>');
+    var ul = jQuery("<ul/>");
+    ul.appendTo(card_block);
+    card_block.appendTo(collapse);
+    collapse.appendTo(card);
+    return card;
+  };
+
+  var sidenav = jQuery("#accordion");
+  _.each(filesmenu, function (item, index) {
+    var card = createCard(index, item.foldername);
 
-    var sidenav = jQuery("#accordion");
-    _.each(filesmenu, function(item, index) {
-        var folder,
-            target,
-            card = createCard(index, item.foldername);
+    item.examples = _.sortBy(item.examples);
+    var ul = card.find("ul");
+    card.appendTo(sidenav);
 
-        item.examples = _.sortBy(item.examples);
-        var ul = card.find("ul");
-        card.appendTo(sidenav);
-        //card.find('.collapse').collapse();
-        _.each(item.examples, function(filepath) {
-            if (filepath.indexOf("_omit") === -1) {
-                var li = jQuery("<li/>").appendTo(ul),
-                    a = jQuery("<a/>").appendTo(li),
-                    fileparts = filepath.split("/");
-                (folder = fileparts[0]), (target = fileparts[1]);
+    item.examples
+      .filter((filepath) => filepath.includes("_omit"))
+      .forEach((filepath) => {
+        var li = jQuery("<li/>").appendTo(ul),
+          a = jQuery("<a/>").appendTo(li),
+          fileparts = filepath.split("/"),
+          folder = fileparts[0],
+          target = fileparts[1];
 
-                a.addClass("example")
-                    .attr("target", "graph_iframe")
-                    .data("folder", folder)
-                    .data("target", target)
-                    .attr(
-                        "href",
-                        "show-example.php?folder=" +
-                            folder +
-                            "&target=" +
-                            target
-                    )
-                    .text(target.replace(".php", ""));
-            }
-        });
-    });
-    jQuery("#accordion").on("click", "a.example", function(e) {
-        e.preventDefault();
-        jQuery("a.example").removeClass("active");
+        a.addClass("example")
+          .attr("target", "graph_iframe")
+          .data("folder", folder)
+          .data("target", target)
+          .attr(
+            "href",
+            "show-example.php?folder=" + folder + "&target=" + target
+          )
+          .text(target.replace(".php", ""));
+      });
+  });
+  jQuery("#accordion").on("click", "a.example", function (e) {
+    e.preventDefault();
+    jQuery("a.example").removeClass("active");
 
-        var $this = $(this),
-            href = $this.attr("href"),
-            folder = $this.data("folder"),
-            target = $this.data("target"),
-            filename = [folder, target].join("/");
-        $this.addClass("active");
-        jQuery("#graph_iframe").attr("src", href);
-        jQuery("#filepath").text(filename);
-        return false;
-    });
-    var firstgroup = jQuery(".card").first();
-    firstgroup.find(".collapsed").click();
-    firstgroup
-        .find("a.example")
-        .first()
-        .click();
+    var $this = $(this),
+      href = $this.attr("href"),
+      folder = $this.data("folder"),
+      target = $this.data("target"),
+      filename = [folder, target].join("/");
+    $this.addClass("active");
+    jQuery("#graph_iframe").attr("src", href);
+    jQuery("#filepath").text(filename);
+    return false;
+  });
+  var firstgroup = jQuery(".card").first();
+  firstgroup.find(".collapsed").click();
+  firstgroup.find("a.example").first().click();
 });
diff --git a/README.md b/README.md
index 734ff2ba..ec29e5b1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # JpGraph Community Edition v4.1.0
 
 ![Packagist Version](https://img.shields.io/packagist/v/amenadiel/jpgraph)
-[![Packagist](https://img.shields.io/packagist/dm/amenadiel/jpgraph.svg)](https://packagist.org/packages/amenadiel/jpgraph) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FHuasoFoundries%2Fjpgraph.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FHuasoFoundries%2Fjpgraph?ref=badge_shield) [![Tests](https://github.com/HuasoFoundries/jpgraph/actions/workflows/tests.yml/badge.svg)](https://github.com/HuasoFoundries/jpgraph/actions/workflows/tests.yml)
+[![Packagist](https://img.shields.io/packagist/dm/amenadiel/jpgraph.svg)](https://packagist.org/packages/amenadiel/jpgraph) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FHuasoFoundries%2Fjpgraph.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FHuasoFoundries%2Fjpgraph?ref=badge_shield) [![Tests](https://github.com/HuasoFoundries/jpgraph/actions/workflows/tests.yml/badge.svg)](https://github.com/HuasoFoundries/jpgraph/actions/workflows/tests.yml) [![codecov](https://codecov.io/gh/HuasoFoundries/jpgraph/branch/master/graph/badge.svg?token=VESbMV2rS4)](https://codecov.io/gh/HuasoFoundries/jpgraph)
+
 
 **JpGraph Community Edition** was created as a [Composer](https://getcomposer.org/) friendly port of [JpGraph v3.5](README.3.5.md). With time and through incremental refactorings, it became a whole different library, with [PSR-1](https://www.php-fig.org/psr/psr-1/) and [PSR-2](https://www.php-fig.org/psr/psr-2/) compliant codebase, namespaces and folder hierarchy enabling [PSR-4](https://www.php-fig.org/psr/psr-4/) autoloading, and more.
 
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 00000000..9e3ed7ba
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,14 @@
+sonar.projectKey=HuasoFoundries_jpgraph
+sonar.organization=huasofoundries
+
+# This is the name and version displayed in the SonarCloud UI.
+#sonar.projectName=jpgraph
+#sonar.projectVersion=1.0
+
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+#sonar.sources=.
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8
+
+#sonar.php.coverage.reportPaths
\ No newline at end of file