Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: iherwig/wcmf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.1.4
Choose a base ref
...
head repository: iherwig/wcmf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 3,934 changed files with 630,756 additions and 11,794 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/docs export-ignore
/tests export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/.sonar-project.properties export-ignore
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
*.log
log.txt
docs/api-gen
dist-wcmf
src/app
src/install
src/wcmf/test/model/model-transformed
vendor
/composer.lock
/src/wcmf/test/log/testdox.txt
!docs/**/theme/vendor
composer.lock
.vscode
todos.txt
43 changes: 34 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
sudo: false
dist: focal

addons:
apt:
packages:
- oracle-java8-installer
- openjdk-8-jdk
- ant
- doxygen
- graphviz
sonarcloud:
organization: "iherwig-github"

services:
- mysql
@@ -12,22 +17,28 @@ language: php

env:
global:
- JAVA_HOME=/usr/lib/jvm/java-8-oracle
- JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
- TEST_DIR=$TRAVIS_BUILD_DIR/src/wcmf/test WCMF_BASE_DIR=$TRAVIS_BUILD_DIR/src
- VENDOR_DIR=$TRAVIS_BUILD_DIR/vendor
- PHPUNIT_DIR=$VENDOR_DIR/phpunit/phpunit
- DOCS_DIR=$TRAVIS_BUILD_DIR/docs
- ENABLE_COVERAGE=0
- ENABLE_SONAR=0
- ENABLE_DOCS=0
- secure: CzS6tWrXhO+YYC3eN2yeB4+BgmA3G62drxgj+XIzu0LdZTjbaafvDQCkNUQ6SUaMguS/WTDr9XcqA5MZy4J5QqucWkidcvGnaH4iBJLdYLQ5aIxZqK75zzf2K9vfgh/Zy2JQh07OKBz4ViCZumY8RdW6jxv3lq68Az5yQ31iG/M=

matrix:
include:
- php: 5.6
env: ENABLE_COVERAGE=1
- php: 7.0
- php: 7.1
- php: 7.3
dist: bionic
- php: 7.4
env: ENABLE_COVERAGE=1 ENABLE_SONAR=1 ENABLE_DOCS=1
- php: 8.0
allow_failures:
- php: 8.0

before_script:
- if [[ "$ENABLE_COVERAGE" == "0" && $TRAVIS_PHP_VERSION != 7.1 ]]; then phpenv config-rm xdebug.ini; fi
- if [[ "$ENABLE_COVERAGE" == "0" ]]; then phpenv config-rm xdebug.ini; fi
- mysql -e 'CREATE DATABASE wcmf_testapp;'
- composer self-update
- composer install
@@ -37,6 +48,20 @@ before_script:
script:
- if [[ "$ENABLE_COVERAGE" == "1" ]]; then cd $TEST_DIR && $PHPUNIT_DIR/phpunit -v --coverage-clover $TRAVIS_BUILD_DIR/logs/clover.xml --bootstrap bootstrap.php -c configuration.xml; fi
- if [[ "$ENABLE_COVERAGE" == "0" ]]; then cd $TEST_DIR && $PHPUNIT_DIR/phpunit -v --bootstrap bootstrap.php -c configuration.xml; fi
- if [[ "$ENABLE_SONAR" == "1" ]]; then sonar-scanner -X -Dsonar.projectBaseDir=$TRAVIS_BUILD_DIR; fi
- if [[ "$ENABLE_DOCS" == "1" ]]; then cd $DOCS_DIR/api-src && ant; fi

cache:
directories:
- '$HOME/.sonar/cache'

after_script:
- if [[ "$ENABLE_COVERAGE" == "1" ]]; then cd $TRAVIS_BUILD_DIR && php $VENDOR_DIR/bin/codacycoverage clover $TRAVIS_BUILD_DIR/logs/clover.xml; fi
- if [[ "$ENABLE_COVERAGE" == "1" ]]; then cd $TRAVIS_BUILD_DIR && php $VENDOR_DIR/bin/codacycoverage clover $TRAVIS_BUILD_DIR/logs/clover.xml; fi

deploy:
provider: pages
skip_cleanup: true
local_dir: $DOCS_DIR/api-gen/html
github_token: $GH_REPO_TOKEN
on:
branch: master
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (C) 2005-2017 wemove digital solutions GmbH
Copyright (C) 2005-2020 wemove digital solutions GmbH

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
33 changes: 16 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -5,32 +5,31 @@ Model Driven Development approach to application
development based on the MVC pattern. It allows to create any kind of
PHP web application, e.g. CRM, CMS from an UML model.

[![Build Status](https://img.shields.io/travis/iherwig/wcmf/master.svg?style=flat-square)](https://travis-ci.org/iherwig/wcmf)
[![Codacy Coverage](https://img.shields.io/codacy/coverage/83131d82c278482a826b070f9736840e.svg?style=flat-square)](https://www.codacy.com/app/iherwig/wcmf)
[![Codacy Badge](https://img.shields.io/codacy/grade/83131d82c278482a826b070f9736840e.svg?style=flat-square)](https://www.codacy.com/app/iherwig/wcmf)
[![Build Status](https://img.shields.io/travis/iherwig/wcmf/master.svg?style=flat-square)](https://travis-ci.com/iherwig/wcmf)
[![Packagist License](https://img.shields.io/packagist/l/wcmf/wcmf.svg?style=flat-square)](https://github.com/iherwig/wcmf/blob/master/LICENSE)
[![Packagist Version](https://img.shields.io/packagist/v/wcmf/wcmf.svg?style=flat-square)](https://packagist.org/packages/wcmf/wcmf)
[![Packagist Downloads](https://img.shields.io/packagist/dt/wcmf/wcmf.svg?style=flat-square)](https://packagist.org/packages/wcmf/wcmf)
[![Packagist Downloads/Month](https://img.shields.io/packagist/dm/wcmf/wcmf.svg?style=flat-square)](https://packagist.org/packages/wcmf/wcmf)

[![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iherwig_wcmf&metric=alert_status)](https://sonarcloud.io/dashboard?id=iherwig_wcmf) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=iherwig_wcmf&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=iherwig_wcmf) [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=iherwig_wcmf&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=iherwig_wcmf) [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=iherwig_wcmf&metric=security_rating)](https://sonarcloud.io/dashboard?id=iherwig_wcmf) [![SonarCloud Bugs](https://sonarcloud.io/api/project_badges/measure?project=iherwig_wcmf&metric=bugs)](https://sonarcloud.io/component_measures/metric/reliability_rating/list?id=iherwig_wcmf) [![SonarCloud Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=iherwig_wcmf&metric=vulnerabilities)](https://sonarcloud.io/component_measures/metric/security_rating/list?id=iherwig_wcmf)

Features
--------
- Full featured object [persistence layer](http://wcmf.wemove.com/persistence.html):
- Flexible [mapper](http://wcmf.wemove.com/persistence.html#pers_mappers) architecture with adapter to RDBMS
- Optimistic and pessimistic [object locking](http://wcmf.wemove.com/persistence.html#Concurrency)
- [Searching](http://wcmf.wemove.com/persistence.html#pers_search) using template based object query and criteria api
- Query caching and [eager relation loading](http://wcmf.wemove.com/persistence.html#pers_builddepth)
- [Transaction](http://wcmf.wemove.com/persistence.html#pers_tx) support
- [Role based permission management](http://wcmf.wemove.com/security.html#Authorization) (for actions, types, instances, instance properties)
- [Event system](http://wcmf.wemove.com/presentation.html#Events)
- [Dependency injection](http://wcmf.wemove.com/configuration.html#Dependencyinjection) support
- Configuration based [routing](http://wcmf.wemove.com/presentation.html#pres_routing)
- Full featured object [persistence layer](http://wcmf.wemove.com/latest/persistence.html):
- Flexible [mapper](http://wcmf.wemove.com/latest/persistence.html#pers_mappers) architecture with adapter to RDBMS
- Optimistic and pessimistic [object locking](http://wcmf.wemove.com/latest/persistence.html#pers_concurrency)
- [Searching](http://wcmf.wemove.com/latest/persistence.html#pers_search) using template based object query and criteria API
- Query caching and [eager relation loading](http://wcmf.wemove.com/latest/persistence.html#pers_builddepth)
- [Transaction](http://wcmf.wemove.com/latest/persistence.html#pers_tx) support
- [Role based permission management](http://wcmf.wemove.com/latest/security.html#sec_authorization) (for actions, types, instances, instance properties)
- [Event system](http://wcmf.wemove.com/latest/presentation.html#pres_events)
- [Dependency injection](http://wcmf.wemove.com/latest/configuration.html#conf_di) support
- Configuration based [routing](http://wcmf.wemove.com/latest/presentation.html#pres_routing)
- [Smarty Template Engine](http://www.smarty.net/) integration
- [Lucene Search Engine](http://framework.zend.com/manual/1.12/en/zend.search.lucene.overview.html) integration
- I18n support
- [I18n/L10n](http://wcmf.wemove.com/latest/i18n_l10n.html) support
- Flexible logging ([Monolog](https://github.com/Seldaek/monolog), [log4php](https://logging.apache.org/log4php/))
- [SOAP and REST interfaces](http://wcmf.wemove.com/presentation.html#WebserviceAPIs) supporting CRUD operations on all objects
- [Eclipse MDT/UML2](http://wiki.eclipse.org/MDT-UML2) compatible [code generator](http://wcmf.wemove.com/model.html#Generator)
- [SOAP and REST interfaces](http://wcmf.wemove.com/latest/presentation.html#pres_apis) supporting CRUD operations on all objects
- [Eclipse MDT/UML2](http://wiki.eclipse.org/MDT-UML2) compatible [code generator](http://wcmf.wemove.com/latest/model.html#Generator)
- Modern [Dojo](https://dojotoolkit.org/) based [default application](https://github.com/iherwig/wcmf-default-app) for content management

License
36 changes: 21 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
"type": "library",
"description": "The wCMF web application framework",
"keywords": ["framework", "mvc", "model-driven", "wcmf"],
"homepage": "http://wcmf.wemove.com",
"homepage": "https://wcmf.wemove.com",
"license": "MIT",
"authors": [
{
@@ -16,34 +16,40 @@
"type": "package",
"package": {
"name": "olympos/chronos-generator",
"version": "1.0.16",
"version": "1.0.25",
"dist": {
"url": "https://downloads.sourceforge.net/project/olympos/ChronosGenerator-wCMF/ChronosGenerator-wCMF-1.0.16.zip",
"url": "https://downloads.sourceforge.net/project/olympos/ChronosGenerator-wCMF/ChronosGenerator-wCMF-1.0.25.zip",
"type": "zip"
}
}
}
],
"require": {
"php": ">=5.6.0",
"php": "^8.1",
"olympos/chronos-generator": "1.0.*",
"monolog/monolog": "~1.22",
"zendframework/zend-db": "2.*",
"zendframework/zendsearch": "^2.0@rc",
"codecasts/nusoap-php7": "~0.9",
"lcobucci/jwt": "~3.2"
"monolog/monolog": "~1.27",
"laminas/laminas-db": "^2.17.0",
"handcraftedinthealps/zendsearch": "^2.1",
"laminas/laminas-eventmanager": "^3.10",
"econea/nusoap": "~0.9.13",
"lcobucci/jwt": "~5.0",
"symfony/cache": "~6.2"
},
"require-dev": {
"phpunit/phpunit": "~5.6",
"phpunit/dbunit": "~1.4",
"codacy/coverage": "dev-master"
"phpunit/phpunit": "~9",
"misantron/dbunit": "~5",
"codeception/codeception": "^5.0",
"codeception/module-phpbrowser": "^3.0",
"codeception/module-db": "^3.1",
"codeception/module-asserts": "^3.0"
},
"suggest": {
"smarty/smarty": "Use this package to render Smarty views via SmartyView",
"nao-pon/elfinder-nightly": "Use this package to integrate elFinder with MediaController",
"eventviva/php-image-resize": "Use this package to resize images using Smarty plugins",
"setasign/fpdi-fpdf": "Use this package to generate PDF files",
"zf1/zend-http": "Use this package, if you want to communicate to other wCMF instances over HTTP"
"intervention/image": "Use this package to resize images using Smarty plugins",
"setasign/fpdi": "Use this package to generate PDF files",
"setasign/tfpdf": "Use this package to generate PDF files",
"php-webdriver/webdriver": "Use this package, if you want to run tests with SeleniumTestCase"
},
"autoload": {
"psr-4": {
Empty file added docs/api-gen/html/.nojekyll
Empty file.
Loading