Fix comparisons in apps #4790

nickvergessen · 2017-05-10T12:25:57Z

Found via #4767

nickvergessen · 2017-05-10T13:25:05Z

apps/dav/lib/Connector/Sabre/File.php

 			if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
 				$expected = $_SERVER['CONTENT_LENGTH'];
-				if ($count != $expected) {
+				if ($count !== $expected) {


int + strings are compared, need to fix

nickvergessen · 2017-05-10T13:25:19Z

apps/dav/lib/Connector/Sabre/File.php

 			if (isset($_SERVER['CONTENT_LENGTH'])) {
 				$expected = $_SERVER['CONTENT_LENGTH'];
-				if ($bytesWritten != $expected) {
+				if ($bytesWritten !== $expected) {


int + strings are compared, need to fix

MorrisJobke · 2017-05-10T21:51:15Z

I would say this is not the best point in time to do stuff like that. 🙈

nickvergessen · 2017-05-11T07:49:34Z

Yeah I just wanted to have one check passed, so we can run the general tests (info.xml, language and database), but maybe it's easier to add an option to only run those...

codecov · 2017-06-19T21:05:42Z

Codecov Report

Merging #4790 into master will decrease coverage by 2.91%.
The diff coverage is 46.96%.

@@             Coverage Diff              @@
##             master    #4790      +/-   ##
============================================
- Coverage     57.06%   54.14%   -2.92%     
- Complexity    21017    22345    +1328     
============================================
  Files          1245     1380     +135     
  Lines         71040    85551   +14511     
  Branches          0     1329    +1329     
============================================
+ Hits          40537    46323    +5786     
- Misses        30503    39228    +8725

Impacted Files	Coverage Δ	Complexity Δ
apps/files_external/templates/settings.php	`0% <ø> (ø)`	`0 <0> (?)`
apps/files_sharing/templates/public.php	`0% <ø> (ø)`	`0 <0> (ø)`	⬇️
apps/files_external/lib/Lib/Storage/FTP.php	`0% <0%> (ø)`	`35 <0> (?)`
apps/files_sharing/lib/Helper.php	`20.35% <0%> (ø)`	`38 <0> (ø)`	⬇️
apps/testing/locking/provisioning.php	`0% <0%> (ø)`	`31 <0> (?)`
apps/files_external/ajax/oauth2.php	`0% <0%> (ø)`	`0 <0> (?)`
apps/files_external/lib/Lib/Storage/Dropbox.php	`0% <0%> (ø)`	`87 <0> (?)`
apps/files_external/lib/Lib/Storage/SFTP.php	`0% <0%> (ø)`	`89 <0> (?)`
apps/files_sharing/lib/ShareBackend/Folder.php	`54.54% <0%> (ø)`	`13 <0> (ø)`	⬇️
apps/dav/lib/CardDAV/CardDavBackend.php	`85.74% <0%> (ø)`	`88 <0> (ø)`	⬇️
... and 564 more

MorrisJobke · 2017-06-19T21:05:45Z

Rebased on current master. @nickvergessen Could you please fix the comments you have?

MorrisJobke

Unit tests fail

nickvergessen · 2017-06-22T07:34:44Z

apps/files_versions/lib/Storage.php

 	 */
 	public static function store($filename) {
-		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)) {


Comparing bool to string worked before, however this config is not documented anywhere.
@schiessle any idea what other values are and why it exists?

nickvergessen · 2017-07-25T12:44:29Z

Rebased and fixed

Fixed

MorrisJobke

Tested and works 👍 Code looks good

rullzer · 2017-08-01T11:50:02Z

Needs a rebase...

Signed-off-by: Joas Schilling <coding@schilljs.com>

MorrisJobke · 2017-08-01T11:54:14Z

Needs a rebase...

Let me try.

Signed-off-by: Joas Schilling <coding@schilljs.com>

MorrisJobke · 2017-08-01T11:59:20Z

Rebased.

nickvergessen · 2017-08-02T13:10:50Z

Phan fail is unrelated?

MorrisJobke · 2017-08-02T14:28:26Z

Phan fail is unrelated?

Correct - this is fixed in master.

nickvergessen added 3. to review Waiting for reviews bug labels May 10, 2017

nickvergessen added this to the Nextcloud 12.0 milestone May 10, 2017

nickvergessen mentioned this pull request May 10, 2017

Check language files and database schema with app code checker #4767

Merged

1 task

nickvergessen commented May 10, 2017

View reviewed changes

MorrisJobke added the 2. developing Work in progress label May 10, 2017

nickvergessen modified the milestones: Nextcloud 13, Nextcloud 12.0 May 11, 2017

nickvergessen removed the 3. to review Waiting for reviews label May 11, 2017

MorrisJobke force-pushed the fix-comparisons-in-apps branch from ef202f3 to 145e3f5 Compare June 19, 2017 21:05

nickvergessen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 20, 2017

nickvergessen requested review from georgehrke and schiessle June 20, 2017 09:28

MorrisJobke approved these changes Jun 21, 2017

View reviewed changes

MorrisJobke previously requested changes Jun 21, 2017

View reviewed changes

MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 21, 2017

nickvergessen commented Jun 22, 2017

View reviewed changes

nickvergessen force-pushed the fix-comparisons-in-apps branch from de1ba6e to 622d80d Compare July 25, 2017 12:25

nickvergessen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jul 25, 2017

MorrisJobke approved these changes Jul 27, 2017

View reviewed changes

MorrisJobke requested review from LukasReschke, icewind1991 and rullzer July 27, 2017 07:09

Fix comparisons in encryption app

0ebdf87

Signed-off-by: Joas Schilling <coding@schilljs.com>

nickvergessen added 10 commits August 1, 2017 13:55

Fix comparisons in the dav app

8923816

Signed-off-by: Joas Schilling <coding@schilljs.com>

Fix comparisons in the versions app

1e2de86

Signed-off-by: Joas Schilling <coding@schilljs.com>

Fix comparison in the ldap app

45e2c41

Signed-off-by: Joas Schilling <coding@schilljs.com>

Fix comparisons in the files app

e30287c

Signed-off-by: Joas Schilling <coding@schilljs.com>

Fix comparisons in the files external app

7a62fbd

Signed-off-by: Joas Schilling <coding@schilljs.com>

Fix comparisons in the sharing app

80febea

Signed-off-by: Joas Schilling <coding@schilljs.com>

Fix comparisions in the trashbin app

d703744

Signed-off-by: Joas Schilling <coding@schilljs.com>

Fix file size comparison

231bb47

Signed-off-by: Joas Schilling <coding@schilljs.com>

Fix versions app

c23c05d

Signed-off-by: Joas Schilling <coding@schilljs.com>

Remove undocumented config

a209342

Signed-off-by: Joas Schilling <coding@schilljs.com>

MorrisJobke force-pushed the fix-comparisons-in-apps branch from 622d80d to a209342 Compare August 1, 2017 11:59

rullzer approved these changes Aug 1, 2017

View reviewed changes

MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 1, 2017

MorrisJobke merged commit 6290ba8 into master Aug 2, 2017

MorrisJobke deleted the fix-comparisons-in-apps branch August 2, 2017 14:28

Uh oh!

Fix comparisons in apps #4790

Fix comparisons in apps #4790

Uh oh!

Conversation

nickvergessen commented May 10, 2017

Uh oh!

nickvergessen May 10, 2017

Choose a reason for hiding this comment

Uh oh!

nickvergessen May 10, 2017

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented May 10, 2017

Uh oh!

nickvergessen commented May 11, 2017

Uh oh!

codecov bot commented Jun 19, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

MorrisJobke commented Jun 19, 2017

Uh oh!

MorrisJobke left a comment

Choose a reason for hiding this comment

Uh oh!

nickvergessen Jun 22, 2017

Choose a reason for hiding this comment

Uh oh!

nickvergessen commented Jul 25, 2017

Uh oh!

MorrisJobke left a comment

Choose a reason for hiding this comment

Uh oh!

rullzer commented Aug 1, 2017

Uh oh!

MorrisJobke commented Aug 1, 2017

Uh oh!

MorrisJobke commented Aug 1, 2017

Uh oh!

nickvergessen commented Aug 2, 2017

Uh oh!

MorrisJobke commented Aug 2, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Jun 19, 2017 •

edited

Loading