Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix owdev builds #112

Merged
merged 4 commits into from
Jun 30, 2016
Merged

Fix owdev builds #112

merged 4 commits into from
Jun 30, 2016

Conversation

pfrischmuth
Copy link
Contributor

This branch contains a) some fixes such that no tests are failing anymore and b) changes such that the owdev jenkins builds are running again.

I tested the owdev build by temporary changing the branch... It seems to work again.

- Fix old style count for ZendDb backends
- Fix Virtuoso ResultRenderer XmlTemplate to use UTF-8 encoding when encoding not set
- Fix import closure to respect useAc parameter
- Fix AC check that in some cases always returned true
- Remove duplicated test suite
- Remove logging settings in order to speed up phpunit runs (log settings are overwritten in ant builds)
@pfrischmuth pfrischmuth added this to the v1.8 milestone Jun 29, 2016
@white-gecko
Copy link
Member

white-gecko commented Jun 30, 2016

  • manual review commits
  • check unit tests: Tests: 647, Assertions: 1306, Incomplete: 3, Skipped: 1.
  • check integration tests mysql: Tests: 63, Assertions: 5834, Skipped: 7.
  • check integration tests virtuoso: Tests: 63, Assertions: 224, Skipped: 9.

<target name="build-integration" depends="prepare,lint,phpunit-integration,phpdoc,phpcb,phpmd-ci,phpcpd,phpcs-ci,pdepend" />
<target name="build-full" depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpdoc,phpunit-integration,phpcb" />
<target name="build-integration" depends="prepare,lint,phpunit-integration,phpdoc,phpcb,phpcpd,phpcs-ci,pdepend" />
<target name="build-full" depends="prepare,lint,phploc,pdepend,phpcs-ci,phpcpd,phpdoc,phpunit-integration,phpcb" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove phpmd?
It is also available with composer: https://packagist.org/packages/phpmd/phpmd
https://phpmd.org/

@pfrischmuth pfrischmuth force-pushed the feature-fix-owdev-builds branch from d31c9f9 to e4c9504 Compare June 30, 2016 15:01
- Require PHP 5.4.0
- Adjust settings for test targets in Makefile
- Add some dev requirements used by ant builds
- Remove a now unused config files
- Fix settings in build.xml to work with dependencies under vendor folder
- Disable phpdoc target, since doc-creator is not working
@pfrischmuth pfrischmuth force-pushed the feature-fix-owdev-builds branch from e4c9504 to c2204d2 Compare June 30, 2016 15:37
@white-gecko white-gecko merged commit 2964447 into develop Jun 30, 2016
@white-gecko white-gecko deleted the feature-fix-owdev-builds branch June 30, 2016 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants