Skip to content

Master merge #87

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.

Sign up for GitHub

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

Merged
s-nakajima merged 4 commits into from
Jun 5, 2020
Merged

Master merge #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d7336f
change: test: travis.ymlからphp5.4,5.5を削除。php7.3,7.4を追加
s-nakajima Mar 13, 2020
0f40c0a
change: php7.4でNoticeが発生するため修正
s-nakajima Mar 14, 2020
b4d5712
change: test: TravisCIがphp74でZipArchiveとimagecreatefromgifを対応していないためp…
s-nakajima Mar 14, 2020
571f94b
change: test: TravisCIがphp74でZipArchiveとimagecreatefromgifを対応していないためエ…
s-nakajima Mar 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: php

php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4

sudo: false
dist: trusty
Expand Down
6 changes: 5 additions & 1 deletion Model/QuizExport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ public function getExportData($quizKey) {
$Plugin = ClassRegistry::init('PluginManager.Plugin');
$composer = $Plugin->getComposer('netcommons/quizzes');
// 最初のデータは小テストプラグインのバージョン
$zipData['version'] = $composer['version'];
if (isset($composer['version'])) {
$zipData['version'] = $composer['version'];
} else {
$zipData['version'] = null;
}

// 言語数分
$Language = ClassRegistry::init('M17n.Language');
Expand Down