Skip to content

Commit

Permalink
Merge branch 'feature-attribute-builder' of https://github.com/larave…
Browse files Browse the repository at this point in the history
…l-appkit/ui into feature-attribute-builder
  • Loading branch information
darrencoutts118 committed Dec 20, 2023
2 parents 51c58d5 + 100c233 commit c400a20
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .php-cs-fixer.cache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"php":"8.3.0","version":"3.41.1","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"braces_position":{"allow_single_line_empty_anonymous_classes":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_type_declaration":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_parentheses":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"unary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Ui.php":"ec96cb32a9fcac6082b91081b167a4e2","src\/AttributeBuilder.php":"200d24525a6f5ee9063ada882ab3e4b1","src\/Components\/BaseComponent.php":"438429a5bb6d0dd223cb2096769a041d","src\/Facades\/Ui.php":"0bb32dde85ecc794eb3f50296cad573f","src\/UiServiceProvider.php":"bf523875e640350bdee1ba48a9a1ef73","tests\/AttributeBagTest.php":"ade346e0748ee6b1a952246d5dc3e457","tests\/Pest.php":"38e4b73a6086e30874b87b1e123815d7","tests\/TestCase.php":"d3975fb98e27a4494d743faaec54ba0b","tests\/AttributeBagClassTest.php":"d533457750083ee4e51e9ae040123fc8","tests\/AttributeBagAttributeHelperTest.php":"e909fd94515b765c9a97399f668ed7a3","tests\/AttributeBagAttributeTest.php":"ccf406c3648b25ee816efa1dec521e06","tests\/AttributeBagConditionalsTest.php":"aec2bbfba408a61d4fe44c0734d8071e"}}
{"php":"8.3.0","version":"3.41.1","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"braces_position":{"allow_single_line_empty_anonymous_classes":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_type_declaration":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_parentheses":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"unary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Ui.php":"ec96cb32a9fcac6082b91081b167a4e2","src\/AttributeBuilder.php":"200d24525a6f5ee9063ada882ab3e4b1","src\/Components\/BaseComponent.php":"438429a5bb6d0dd223cb2096769a041d","src\/Facades\/Ui.php":"0bb32dde85ecc794eb3f50296cad573f","src\/UiServiceProvider.php":"bf523875e640350bdee1ba48a9a1ef73","tests\/AttributeBagTest.php":"ade346e0748ee6b1a952246d5dc3e457","tests\/Pest.php":"38e4b73a6086e30874b87b1e123815d7","tests\/TestCase.php":"d3975fb98e27a4494d743faaec54ba0b","tests\/AttributeBagClassTest.php":"d533457750083ee4e51e9ae040123fc8","tests\/AttributeBagAttributeHelperTest.php":"e909fd94515b765c9a97399f668ed7a3","tests\/AttributeBagAttributeTest.php":"ccf406c3648b25ee816efa1dec521e06","tests\/AttributeBagConditionalsTest.php":"aec2bbfba408a61d4fe44c0734d8071e","tests\/ComponentIntegrationTest.php":"7adcf327b07274d8fbd43519a9a5c1e4","tests\/Components\/HigherOrderTestComponent.php":"15efaa3bdbf88813c1d5e8288c6233f2","tests\/Components\/TestComponent.php":"87a27ebd27eb10f6eb24129251d21b37"}}
2 changes: 1 addition & 1 deletion tests/Components/HigherOrderTestComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class HigherOrderTestComponent extends TestComponent
* The last instantiated instance
* @var $this
*/
static $lastInstance = null;
public static $lastInstance = null;

public function __construct()
{
Expand Down
2 changes: 0 additions & 2 deletions tests/Pest.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?php

use AppKit\UI\AttributeBuilder;
use AppKit\UI\Tests\Components\TestComponent;
use Illuminate\Support\Facades\Blade;
use Illuminate\View\ComponentAttributeBag;

/*
Expand Down

0 comments on commit c400a20

Please sign in to comment.