Skip to content

Commit 80d8e2c

Browse files
p123-stackp123-stack
committed
temp commit
1 parent a7c29ec commit 80d8e2c

File tree

6 files changed

+78
-77
lines changed

6 files changed

+78
-77
lines changed

‎src/Authentication/BasicAuth.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
5151
$helloMetadata = ['user_agent' => $userAgent];
5252

5353
$factory->createHelloMessage($helloMetadata)->send();
54-
$response = ResponseHelper::getResponse($protocol);
54+
$response = $protocol->getResponse();
5555

5656
$credentials = [
5757
'scheme' => 'basic',
@@ -60,7 +60,7 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
6060
];
6161

6262
$factory->createLogonMessage($credentials)->send();
63-
ResponseHelper::getResponse($protocol);
63+
$protocol->getResponse();
6464

6565
/** @var array{server: string, connection_id: string, hints: list} */
6666
return $response->content;
@@ -76,7 +76,7 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
7676
$factory->createHelloMessage($helloMetadata)->send();
7777

7878
/** @var array{server: string, connection_id: string, hints: list} */
79-
return ResponseHelper::getResponse($protocol)->content;
79+
return $protocol->getResponse()->content;
8080
}
8181

8282
/**
@@ -86,7 +86,7 @@ public function logoff(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol): void
8686
{
8787
$factory = $this->createMessageFactory($protocol);
8888
$factory->createLogoffMessage()->send();
89-
ResponseHelper::getResponse($protocol);
89+
$protocol->getResponse();
9090
}
9191

9292
public function toString(UriInterface $uri): string

‎src/Authentication/KerberosAuth.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
6262

6363
$factory->createHelloMessage(['user_agent' => $userAgent])->send();
6464

65-
$response = ResponseHelper::getResponse($protocol);
65+
$response = $protocol->getResponse();
6666

6767
$this->logger?->log(LogLevel::DEBUG, 'LOGON', ['scheme' => 'kerberos', 'principal' => '']);
6868

@@ -72,7 +72,7 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
7272
'credentials' => $this->token,
7373
])->send();
7474

75-
ResponseHelper::getResponse($protocol);
75+
$protocol->getResponse();
7676

7777
/**
7878
* @var array{server: string, connection_id: string, hints: list}

‎src/Authentication/NoAuth.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
5757
$helloMetadata = ['user_agent' => $userAgent];
5858

5959
$factory->createHelloMessage($helloMetadata)->send();
60-
$response = ResponseHelper::getResponse($protocol);
60+
$response = $protocol->getResponse();
6161

6262
$factory->createLogonMessage(['scheme' => 'none'])->send();
63-
ResponseHelper::getResponse($protocol);
63+
$protocol->getResponse();
6464

6565
/** @var array{server: string, connection_id: string, hints: list} */
6666
return $response->content;
@@ -74,14 +74,14 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
7474
$factory->createHelloMessage($helloMetadata)->send();
7575

7676
/** @var array{server: string, connection_id: string, hints: list} */
77-
return ResponseHelper::getResponse($protocol)->content;
77+
return $protocol->getResponse()->content;
7878
}
7979

8080
public function logoff(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol): void
8181
{
8282
$factory = $this->createMessageFactory($protocol);
8383
$factory->createLogoffMessage()->send();
84-
ResponseHelper::getResponse($protocol);
84+
$protocol->getResponse();
8585
}
8686

8787
public function toString(UriInterface $uri): string

‎src/Authentication/OpenIDConnectAuth.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
5959

6060
$factory->createHelloMessage(['user_agent' => $userAgent])->send();
6161

62-
$response = ResponseHelper::getResponse($protocol);
62+
$response = $protocol->getResponse();
6363

6464
$this->logger?->log(LogLevel::DEBUG, 'LOGON', ['scheme' => 'bearer']);
6565

@@ -68,7 +68,7 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
6868
'credentials' => $this->token,
6969
])->send();
7070

71-
ResponseHelper::getResponse($protocol);
71+
$protocol->getResponse();
7272

7373
/**
7474
* @var array{server: string, connection_id: string, hints: list}

‎src/Formatter/SummarizedResultFormatter.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ function (mixed $response) use ($connection, $statement, $runStart, $resultAvail
198198
/**
199199
* @var SummarizedResult<CypherMap<OGMTypes>>
200200
*/
201-
return new SummarizedResult($summary, (new CypherList($formattedResult))->withCacheLimit($result->getFetchSize()));
201+
return new SummarizedResult($summary, (new CypherList($formattedResult))->withCacheLimit($result->getFetchSize()),
202+
$meta['fields'] ?? [] );
202203
}
203204

204205
public function formatArgs(array $profiledPlanData): PlanArguments

‎testkit-backend/testkit.sh‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -42,75 +42,75 @@ EXIT_CODE=0
4242
#test_authentication
4343
python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic || EXIT_CODE=1
4444

45-
#test_bookmarks
46-
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks || EXIT_CODE=1
47-
48-
#test_session_run
49-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_smaller_than_fetch_size
50-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_node
51-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_relationship
52-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_path
53-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_autocommit_transactions_should_support_metadata
54-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_regex_in_parameter
55-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_regex_inline
56-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_larger_than_fetch_size
57-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_partial_iteration
58-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_simple_query
59-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_session_reuse
60-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_nested
61-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_recover_from_invalid_query
62-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_recover_from_fail_on_streaming
63-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_updates_last_bookmark
64-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_bad_syntax
65-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_missing_parameter
66-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_long_string
67-
68-
#test_direct_driver
69-
## test_direct_driver
70-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_custom_resolver|| EXIT_CODE=1
71-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_fail_nicely_when_using_http_port|| EXIT_CODE=1
72-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_supports_multi_db|| EXIT_CODE=1
73-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_non_existing
74-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db|| EXIT_CODE=1
75-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_various_databases|| EXIT_CODE=1
76-
77-
#test_summary
78-
python3 -m unittest tests.neo4j.test_summary.TestSummary
79-
80-
####stub
81-
####test-basic-query
82-
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_path_element_ids_with_string
83-
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_node_element_id_with_id
84-
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_node_element_id_with_string
85-
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_rel_element_id_with_id
86-
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_path_element_ids_with_long
45+
##test_bookmarks
46+
#python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks || EXIT_CODE=1
47+
#
48+
##test_session_run
49+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_smaller_than_fetch_size
50+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_node
51+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_relationship
52+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_path
53+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_autocommit_transactions_should_support_metadata
54+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_regex_in_parameter
55+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_regex_inline
56+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_larger_than_fetch_size
57+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_partial_iteration
58+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_simple_query
59+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_session_reuse
60+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_nested
61+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_recover_from_invalid_query
62+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_recover_from_fail_on_streaming
63+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_updates_last_bookmark
64+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_bad_syntax
65+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_missing_parameter
66+
#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_long_string
67+
#
68+
##test_direct_driver
69+
### test_direct_driver
70+
#python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_custom_resolver|| EXIT_CODE=1
71+
#python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_fail_nicely_when_using_http_port|| EXIT_CODE=1
72+
#python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_supports_multi_db|| EXIT_CODE=1
73+
#python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_non_existing
74+
#python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db|| EXIT_CODE=1
75+
#python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_various_databases|| EXIT_CODE=1
76+
#
77+
##test_summary
78+
#python3 -m unittest tests.neo4j.test_summary.TestSummary
79+
#
80+
#####stub
81+
#####test-basic-query
82+
#python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_path_element_ids_with_string
83+
#python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_node_element_id_with_id
84+
#python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_node_element_id_with_string
85+
#python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_rel_element_id_with_id
86+
#python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_path_element_ids_with_long
8787

8888
#test_tx_run
89-
This test is still failing so we skip it test_direct_driver
89+
#This test is still failing so we skip it test_direct_driver
9090
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_be_able_to_rollback_a_failure || EXIT_CODE=1
9191
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_tx_timeout || EXIT_CODE=1
9292
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_commit_a_failure || EXIT_CODE=1
9393

94-
94+
#
9595
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_simple_query || EXIT_CODE=1
96-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_commit_transaction || EXIT_CODE=1
97-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_rollback_transaction || EXIT_CODE=1
98-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_updates_last_bookmark_on_commit || EXIT_CODE=1
99-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_does_not_update_last_bookmark_on_rollback || EXIT_CODE=1
100-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_does_not_update_last_bookmark_on_failure || EXIT_CODE=1
101-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_rollback_a_rollbacked_tx || EXIT_CODE=1
102-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_rollback_a_commited_tx || EXIT_CODE=1
103-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_commit_a_commited_tx || EXIT_CODE=1
104-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_allow_run_on_a_commited_tx || EXIT_CODE=1
105-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_allow_run_on_a_rollbacked_tx || EXIT_CODE=1
106-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_run_valid_query_in_invalid_tx || EXIT_CODE=1
107-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_run_in_a_commited_tx || EXIT_CODE=1
108-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_run_in_a_rollbacked_tx || EXIT_CODE=1
109-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_to_run_query_for_invalid_bookmark || EXIT_CODE=1
110-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_broken_transaction_should_not_break_session || EXIT_CODE=1
111-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_tx_configuration || EXIT_CODE=1
112-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_consume_after_commit || EXIT_CODE=1
113-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_parallel_queries || EXIT_CODE=1
114-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_interwoven_queries || EXIT_CODE=1
115-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_unconsumed_result || EXIT_CODE=1
96+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_commit_transaction || EXIT_CODE=1
97+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_rollback_transaction || EXIT_CODE=1
98+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_updates_last_bookmark_on_commit || EXIT_CODE=1
99+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_does_not_update_last_bookmark_on_rollback || EXIT_CODE=1
100+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_does_not_update_last_bookmark_on_failure || EXIT_CODE=1
101+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_rollback_a_rollbacked_tx || EXIT_CODE=1
102+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_rollback_a_commited_tx || EXIT_CODE=1
103+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_commit_a_commited_tx || EXIT_CODE=1
104+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_allow_run_on_a_commited_tx || EXIT_CODE=1
105+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_allow_run_on_a_rollbacked_tx || EXIT_CODE=1
106+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_run_valid_query_in_invalid_tx || EXIT_CODE=1
107+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_run_in_a_commited_tx || EXIT_CODE=1
108+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_run_in_a_rollbacked_tx || EXIT_CODE=1
109+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_to_run_query_for_invalid_bookmark || EXIT_CODE=1
110+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_broken_transaction_should_not_break_session || EXIT_CODE=1
111+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_tx_configuration || EXIT_CODE=1
112+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_consume_after_commit || EXIT_CODE=1
113+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_parallel_queries || EXIT_CODE=1
114+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_interwoven_queries || EXIT_CODE=1
115+
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_unconsumed_result || EXIT_CODE=1
116116

0 commit comments

Comments
 (0)