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.

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

[9.x] Avoid matching 'use' in custom Stub templates #44049

Merged
merged 1 commit into from
Sep 8, 2022

Conversation

cschra
Copy link
Contributor

@cschra cschra commented Sep 8, 2022

When using custom stubs the word 'use' is also matched outside of the import statement. With this change only the lines starting with use are taken into consideration.

Use Case:
We added an Apache License Header to the module stub and the word 'use' (L4) is used inside the license text.

<?php
/**
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at:
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

namespace {{ namespace }};
[...]

output of the $imports variable:

array:13 [
  0 => "use this file except in compliance with the License."
  1 => " * You may obtain a copy of the License at:"
  2 => " *"
  3 => " * http://www.apache.org/licenses/LICENSE-2.0"
  4 => " *"
  5 => " * Unless required by applicable law or agreed to in writing, software"
  6 => " * distributed under the License is distributed on an "AS IS" BASIS,"
  7 => " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied."
  8 => " * See the License for the specific language governing permissions and"
  9 => " * limitations under the License."
  10 => " */"
  11 => ""
  12 => "namespace App;"
]

When using custom stubs the word 'use' is also matched outside of the import statement.
With this change only the lines starting with use are taken into consideration.
@taylorotwell taylorotwell merged commit 964c2b4 into laravel:9.x Sep 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants