summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--CHANGELOG.md5
-rw-r--r--Dockerfile9
-rw-r--r--README.md1
-rwxr-xr-xrun.sh9
-rw-r--r--test/results/java-maven.json6
-rw-r--r--test/results/php-composer.json749
-rw-r--r--test/results/python-pip.json5
-rw-r--r--test/results/python3-pip.json5
-rw-r--r--test/results/ruby-bundler.json2
10 files changed, 781 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0dabd7..63d619b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,13 @@ QA:ruby-bundler:
extends: .QA
variables:
QA_PROJECT: ruby-bundler
- QA_REF: 6b858821
+ QA_REF: 69654651
+
+QA:php-composer:
+ extends: .QA
+ variables:
+ QA_PROJECT: php-composer
+ QA_REF: ab6961ab
QA:go:
extends: .QA
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2d60d8..26e8113 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
# GitLab License management changelog
+## v1.4.0
+
+- Bump LicenseFinder to 5.9.2
+- Add support for PhP language
+
## v1.3.0
- Add `LM_PYTHON_VERSION` variable, to be set to `3` to switch to Python 3.5, pip 19.1.1. (!36)
diff --git a/Dockerfile b/Dockerfile
index 900019b..91b7b5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG LICENSE_FINDER_VERSION=5.6.2
+ARG LICENSE_FINDER_VERSION=5.9.2
FROM licensefinder/license_finder:$LICENSE_FINDER_VERSION
MAINTAINER GitLab
@@ -13,6 +13,10 @@ RUN cd /tmp && \
mv jdk-11.0.2+9 /usr/lib/jvm/adoptopen_jdk11 && \
rm /tmp/jdk-11.tgz
+# Install additional php packages for better composer package support
+RUN add-apt-repository ppa:ondrej/php && apt update -y && \
+ apt install php7.1-mbstring php7.1-intl php7.1-xml php7.1-soap -y
+
RUN npm install npm-install-peers cheerio
# Don't let Rubygem fail with the numerous projects using PG or MySQL,
@@ -22,9 +26,6 @@ RUN apt-get update && \
libpq-dev libmysqlclient-dev realpath python3-dev python3-pip && \
rm -rf /var/lib/apt/lists/*
-# Don't load RVM automatically, it doesn't work with GitLab-CI
-RUN mv /etc/profile.d/rvm.sh /rvm.sh
-
# Warning! Environment variable PIP_VERSION causes the upgrade of pip to fail.
ARG VERSION_OF_PIP=19.1.1
ENV VERSION_OF_PIP $VERSION_OF_PIP
diff --git a/README.md b/README.md
index 62daeaa..18db03f 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,7 @@ The following table shows which languages and package managers are supported.
| .NET | [Nuget](https://www.nuget.org/) |
| Python | [pip](https://pip.pypa.io/en/stable/) |
| Ruby | [gem](https://rubygems.org/) |
+| PHP | [composer](https://getcomposer.org) |
Inject `SETUP_CMD` to the docker command to override the given package managers
and run your custom command to setup your environment with a custom package manager.
diff --git a/run.sh b/run.sh
index 0ce0266..019d087 100755
--- a/run.sh
+++ b/run.sh
@@ -95,9 +95,6 @@ case "$COMMAND" in
analyze)
# Analyze project
- # Load RVM
- source /rvm.sh
-
# Change current directory to the project path.
APP_PATH=$1
shift
@@ -112,7 +109,9 @@ case "$COMMAND" in
# So we ignore the error.
$($rvm_recommended_ruby) 2>/dev/null || true
rvm use .
- gem install bundler
+ # rvm pulls outdated gems
+ # need this to update system bundler
+ gem update --system
# We need to install the license_finder gem into this Ruby version too.
gem install license_finder -v "$LICENSE_FINDER_VERSION"
fi
@@ -120,7 +119,7 @@ case "$COMMAND" in
# Ignore test and development dependencies.
license_finder ignored_groups add development
license_finder ignored_groups add test
- bundle install --without "development test"
+ bundle install
skip_prepare=true
fi
diff --git a/test/results/java-maven.json b/test/results/java-maven.json
index 58e9260..4adc58c 100644
--- a/test/results/java-maven.json
+++ b/test/results/java-maven.json
@@ -30,7 +30,7 @@
},
{
"count": 1,
- "name": "MPL 1.1, LGPL 2.1, Apache 2.0"
+ "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0"
},
{
"count": 1,
@@ -221,8 +221,8 @@
},
{
"license": {
- "name": "MPL 1.1, LGPL 2.1, Apache 2.0",
- "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0",
+ "url": "https://opensource.org/licenses/LGPL-2.1"
},
"dependency": {
"name": "javassist",
diff --git a/test/results/php-composer.json b/test/results/php-composer.json
new file mode 100644
index 0000000..6b9833d
--- /dev/null
+++ b/test/results/php-composer.json
@@ -0,0 +1,749 @@
+{
+ "licenses": [
+ {
+ "count": 36,
+ "name": "MIT"
+ },
+ {
+ "count": 18,
+ "name": "New BSD"
+ },
+ {
+ "count": 1,
+ "name": "BSD-3-Clause-Attribution"
+ },
+ {
+ "count": 1,
+ "name": "Simplified BSD"
+ }
+ ],
+ "dependencies": [
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "classpreloader/classpreloader",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "dnoegel/php-xdg-base-dir",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "doctrine/inflector",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "doctrine/instantiator",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "Simplified BSD",
+ "url": "http://opensource.org/licenses/bsd-license"
+ },
+ "dependency": {
+ "name": "jakub-onderka/php-console-color",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "jakub-onderka/php-console-highlighter",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "jeremeamia/SuperClosure",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "laravel/framework",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "league/flysystem",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "monolog/monolog",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "mtdowling/cron-expression",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "myclabs/deep-copy",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "nesbot/carbon",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "nikic/php-parser",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "paragonie/random_compat",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "phpdocumentor/reflection-common",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "phpdocumentor/reflection-docblock",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "phpdocumentor/type-resolver",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "phpspec/prophecy",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "phpunit/php-code-coverage",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "phpunit/php-file-iterator",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "phpunit/php-text-template",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "phpunit/php-timer",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "phpunit/php-token-stream",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "phpunit/phpunit",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "phpunit/phpunit-mock-objects",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "psr/log",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "psy/psysh",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "ramsey/uuid",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "sebastian/code-unit-reverse-lookup",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "sebastian/comparator",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "sebastian/diff",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "sebastian/environment",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "sebastian/exporter",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "sebastian/global-state",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "sebastian/object-enumerator",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "sebastian/recursion-context",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "sebastian/resource-operations",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "sebastian/version",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "swiftmailer/swiftmailer",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/console",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/debug",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/event-dispatcher",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/finder",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/http-foundation",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/http-kernel",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/polyfill-mbstring",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/polyfill-php56",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/polyfill-util",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/process",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/routing",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/translation",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/var-dumper",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "symfony/yaml",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "BSD-3-Clause-Attribution"
+ },
+ "dependency": {
+ "name": "vlucas/phpdotenv",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "MIT",
+ "url": "http://opensource.org/licenses/mit-license"
+ },
+ "dependency": {
+ "name": "webmozart/assert",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ }
+ ]
+}
diff --git a/test/results/python-pip.json b/test/results/python-pip.json
index 3aa6f39..5adaedd 100644
--- a/test/results/python-pip.json
+++ b/test/results/python-pip.json
@@ -14,7 +14,7 @@
},
{
"count": 1,
- "name": "New BSD License"
+ "name": "New BSD"
},
{
"count": 1,
@@ -125,7 +125,8 @@
},
{
"license": {
- "name": "New BSD License"
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
},
"dependency": {
"name": "django-xmlrpc",
diff --git a/test/results/python3-pip.json b/test/results/python3-pip.json
index d98669d..6cf3676 100644
--- a/test/results/python3-pip.json
+++ b/test/results/python3-pip.json
@@ -14,7 +14,7 @@
},
{
"count": 1,
- "name": "New BSD License"
+ "name": "New BSD"
},
{
"count": 1,
@@ -129,7 +129,8 @@
},
{
"license": {
- "name": "New BSD License"
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
},
"dependency": {
"name": "django-xmlrpc",
diff --git a/test/results/ruby-bundler.json b/test/results/ruby-bundler.json
index c66a9a3..03b3505 100644
--- a/test/results/ruby-bundler.json
+++ b/test/results/ruby-bundler.json
@@ -21,7 +21,7 @@
},
"dependency": {
"name": "bundler",
- "url": "https://bundler.io",
+ "url": "http://bundler.io",
"description": "The best way to manage your application's dependencies",
"pathes": [
"."
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-02 22:58:03 +0000