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.

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

Jump to bottom

Split piwik.js in multiple files minor tweak #10449

Merged
merged 3 commits into from
Sep 19, 2016
Merged

Split piwik.js in multiple files minor tweak #10449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
107a707
Split piwik.js in multiple files minor tweak
mattab Aug 28, 2016
76fa28d
Do not create the piwik.js in tests as it's not needed
mattab Sep 19, 2016
f7b75b4
check whether test failure is related to previous commit: re-add file…
mattab Sep 19, 2016
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
2 changes: 1 addition & 1 deletion plugins/CustomPiwikJs/Commands/UpdateTracker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
{
$sourceFile = $input->getOption('source-file');
$targetFile = $input->getOption('target-file');
$ignoreMinified = $input->hasOption('ignore-minified');
$ignoreMinified = (bool)$input->getOption('ignore-minified');

$this->updateTracker($sourceFile, $targetFile, $ignoreMinified);

Expand Down
2 changes: 1 addition & 1 deletion plugins/CustomPiwikJs/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function getName()
*/
public function hasWriteAccess()
{
return $this->hasReadAccess() && is_writable($this->file);
return is_writable($this->file);
Copy link
Member Author

Choose a reason for hiding this comment

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

hopefully it's fine to just check whether file is writable. It solves the issue when the target file does not exist yet, hasWriteAccess should return true when the file can be created/written to.

Copy link
Member

Choose a reason for hiding this comment

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

FYI: I had it like this on purpose for now and in tests just created the file in advance

}

/**
Expand Down