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

[NDB_Factory] Remove testing mode #7199

Merged
merged 23 commits into from
Jan 7, 2021
Merged

[NDB_Factory] Remove testing mode #7199

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c49ffbb
[NDB_Factory] Remove testing mode
driusan Dec 14, 2020
4e36246
PHPCS
driusan Dec 14, 2020
59e196f
Remove calls to setTesting
driusan Dec 14, 2020
e788ad4
Do not suppress phan
driusan Dec 14, 2020
ea5c90e
More setTesting calls
driusan Dec 14, 2020
596c6b7
phpcs
driusan Dec 14, 2020
872ae41
one more settesting
driusan Dec 14, 2020
ab9b301
Add some missing sets
driusan Dec 14, 2020
6d8086a
Missing config in database test
driusan Dec 14, 2020
141628b
missing configs
driusan Dec 14, 2020
0170f11
More setters
driusan Dec 14, 2020
a0ce835
And another
driusan Dec 14, 2020
86e02aa
Set factory in integration tests
driusan Dec 14, 2020
e660731
Set the factory in NDB_Client
driusan Dec 14, 2020
0a124cd
Explicitly set database in NDB_Client
driusan Dec 14, 2020
6959d7b
phpcs
driusan Dec 14, 2020
d8117df
Typo
driusan Dec 14, 2020
9fd7b0d
More sets
driusan Dec 14, 2020
aae2395
Test
driusan Dec 14, 2020
3fda1ce
Use same structure as Database tests
driusan Dec 14, 2020
265ed8c
typo
driusan Dec 14, 2020
3bf3057
Use mocks for failing tests
driusan Dec 16, 2020
81deef5
Do not depend on RB for utility test
driusan Dec 16, 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
Prev Previous commit
Next Next commit
Explicitly set database in NDB_Client
  • Loading branch information
@driusan
driusan committed Dec 14, 2020
commit 0a124cd787e1fca79c73a4e50aaa3e306e5c8226
7 changes: 3 additions & 4 deletions php/libraries/NDB_Client.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,13 @@ class NDB_Client
$DBSettings['host'],
true
);
// Now make sure the factory reference is the same as the
// singleton reference
$factory->setDatabase($DB);
}

// Now make sure the factory reference is the same as the
// singleton reference
$DB = $factory->database();

$factory->setConfig($config);
$factory->setDatabase($DB);

// add extra include paths. This must be done
// after the database is connected, since the setting
Expand Down